Diff for /qemu/configure between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2018/04/24 16:40:42 version 1.1.1.4, 2018/04/24 16:42:43
Line 95  check_gcc="yes" Line 95  check_gcc="yes"
 softmmu="yes"  softmmu="yes"
 user="no"  user="no"
 build_docs="no"  build_docs="no"
   build_acpi_tables="no"
   uname_release=""
   
 # OS specific  # OS specific
 targetos=`uname -s`  targetos=`uname -s`
Line 211  for opt do Line 213  for opt do
   ;;    ;;
   --fmod-inc=*) fmod_inc="$optarg"    --fmod-inc=*) fmod_inc="$optarg"
   ;;    ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"    --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"
   ;;    ;;
   --disable-slirp) slirp="no"    --disable-slirp) slirp="no"
   ;;    ;;
Line 237  for opt do Line 239  for opt do
   ;;    ;;
   --enable-user) user="yes"    --enable-user) user="yes"
   ;;    ;;
     --enable-uname-release=*) uname_release="$optarg"
     ;;
     --enable-iasl) build_acpi_tables="yes"
     ;;
   esac    esac
 done  done
   
Line 284  echo "  --enable-user            enable  Line 290  echo "  --enable-user            enable 
 echo "  --disable-user           disable all linux usermode emulation targets"  echo "  --disable-user           disable all linux usermode emulation targets"
 echo "  --fmod-lib               path to FMOD library"  echo "  --fmod-lib               path to FMOD library"
 echo "  --fmod-inc               path to FMOD includes"  echo "  --fmod-inc               path to FMOD includes"
   echo "  --enable-uname-release=R Return R for uname -r in usermode emulation"
   echo "  --enable-iasl            compilation of ACPI tables with the IASL compiler"
 echo ""  echo ""
 echo "NOTE: The object files are build at the place where configure is launched"  echo "NOTE: The object files are build at the place where configure is launched"
 exit 1  exit 1
Line 293  cc="${cross_prefix}${cc}" Line 301  cc="${cross_prefix}${cc}"
 ar="${cross_prefix}${ar}"  ar="${cross_prefix}${ar}"
 strip="${cross_prefix}${strip}"  strip="${cross_prefix}${strip}"
   
 if [ ! -x "`which $cc`" ] ; then  # check that the C compiler works.
     echo "Compiler $cc could not be found"  cat > $TMPC <<EOF
     exit  int main(void) {}
   EOF
   
   if $cc -c -o $TMPO $TMPC 2>/dev/null ; then
     : C compiler works ok
   else
       echo "ERROR: \"$cc\" either does not exist or does not work"
       exit 1
 fi  fi
   
 if test "$mingw32" = "yes" ; then  if test "$mingw32" = "yes" ; then
     linux="no"      linux="no"
     EXESUF=".exe"      EXESUF=".exe"
     gdbstub="no"  
     oss="no"      oss="no"
     if [ "$cpu" = "i386" ] ; then      if [ "$cpu" = "i386" ] ; then
         kqemu="yes"          kqemu="yes"
Line 546  fi Line 560  fi
 echo "FMOD support      $fmod $fmod_support"  echo "FMOD support      $fmod $fmod_support"
 echo "kqemu support     $kqemu"  echo "kqemu support     $kqemu"
 echo "Documentation     $build_docs"  echo "Documentation     $build_docs"
   [ ! -z "$uname_release" ] && \
   echo "uname -r          $uname_release"
   
 if test $sdl_too_old = "yes"; then  if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"  echo "-> Your SDL version is too old - please upgrade to have SDL support"
Line 696  echo "TARGET_DIRS=$target_list" >> $conf Line 712  echo "TARGET_DIRS=$target_list" >> $conf
 if [ "$build_docs" = "yes" ] ; then  if [ "$build_docs" = "yes" ] ; then
   echo "BUILD_DOCS=yes" >> $config_mak    echo "BUILD_DOCS=yes" >> $config_mak
 fi  fi
   if [ "$build_acpi_tables" = "yes" ] ; then
     echo "BUILD_ACPI_TABLES=yes" >> $config_mak
   fi
   
 # XXX: suppress that  # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then  if [ "$bsd" = "yes" ] ; then
Line 704  if [ "$bsd" = "yes" ] ; then Line 723  if [ "$bsd" = "yes" ] ; then
   echo "#define _BSD 1" >> $config_h    echo "#define _BSD 1" >> $config_h
 fi  fi
   
   echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
   
 for target in $target_list; do  for target in $target_list; do
 target_dir="$target"  target_dir="$target"
 config_mak=$target_dir/config.mak  config_mak=$target_dir/config.mak
Line 716  target_bigendian="no" Line 737  target_bigendian="no"
 [ "$target_cpu" = "ppc" ] && target_bigendian=yes  [ "$target_cpu" = "ppc" ] && target_bigendian=yes
 [ "$target_cpu" = "ppc64" ] && target_bigendian=yes  [ "$target_cpu" = "ppc64" ] && target_bigendian=yes
 [ "$target_cpu" = "mips" ] && target_bigendian=yes  [ "$target_cpu" = "mips" ] && target_bigendian=yes
   [ "$target_cpu" = "sh4eb" ] && target_bigendian=yes
 target_softmmu="no"  target_softmmu="no"
 if expr $target : '.*-softmmu' > /dev/null ; then  if expr $target : '.*-softmmu' > /dev/null ; then
   target_softmmu="yes"    target_softmmu="yes"
Line 758  echo "/* Automatically generated by conf Line 780  echo "/* Automatically generated by conf
 echo "include ../config-host.mak" >> $config_mak  echo "include ../config-host.mak" >> $config_mak
 echo "#include \"../config-host.h\"" >> $config_h  echo "#include \"../config-host.h\"" >> $config_h
   
   bflt="no"
 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`  interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h  echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
   
Line 772  elif test "$target_cpu" = "arm" -o "$tar Line 795  elif test "$target_cpu" = "arm" -o "$tar
   echo "TARGET_ARCH=arm" >> $config_mak    echo "TARGET_ARCH=arm" >> $config_mak
   echo "#define TARGET_ARCH \"arm\"" >> $config_h    echo "#define TARGET_ARCH \"arm\"" >> $config_h
   echo "#define TARGET_ARM 1" >> $config_h    echo "#define TARGET_ARM 1" >> $config_h
     bflt="yes"
 elif test "$target_cpu" = "sparc" ; then  elif test "$target_cpu" = "sparc" ; then
   echo "TARGET_ARCH=sparc" >> $config_mak    echo "TARGET_ARCH=sparc" >> $config_mak
   echo "#define TARGET_ARCH \"sparc\"" >> $config_h    echo "#define TARGET_ARCH \"sparc\"" >> $config_h
Line 802  elif test "$target_cpu" = "mips" -o "$ta Line 826  elif test "$target_cpu" = "mips" -o "$ta
   echo "TARGET_ARCH=mips" >> $config_mak    echo "TARGET_ARCH=mips" >> $config_mak
   echo "#define TARGET_ARCH \"mips\"" >> $config_h    echo "#define TARGET_ARCH \"mips\"" >> $config_h
   echo "#define TARGET_MIPS 1" >> $config_h    echo "#define TARGET_MIPS 1" >> $config_h
 elif test "$target_cpu" = "sh4" ; then    echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
     echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
   elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then
   echo "TARGET_ARCH=sh4" >> $config_mak    echo "TARGET_ARCH=sh4" >> $config_mak
   echo "#define TARGET_ARCH \"sh4\"" >> $config_h    echo "#define TARGET_ARCH \"sh4\"" >> $config_h
   echo "#define TARGET_SH4 1" >> $config_h    echo "#define TARGET_SH4 1" >> $config_h
     bflt="yes"
 else  else
   echo "Unsupported target CPU"    echo "Unsupported target CPU"
   exit 1    exit 1
Line 823  if test "$target_user_only" = "yes" ; th Line 850  if test "$target_user_only" = "yes" ; th
   echo "#define CONFIG_USER_ONLY 1" >> $config_h    echo "#define CONFIG_USER_ONLY 1" >> $config_h
 fi  fi
   
 if test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then  if test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" -o "$target_cpu" = "sparc" -o "$target_cpu" = "sparc64"; then
   echo "CONFIG_SOFTFLOAT=yes" >> $config_mak    echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
   echo "#define CONFIG_SOFTFLOAT 1" >> $config_h    echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
 fi  fi
   if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
     echo "TARGET_HAS_BFLT=yes" >> $config_mak
     echo "#define TARGET_HAS_BFLT 1" >> $config_h
   fi
 # sdl defines  # sdl defines
   
 if test "$target_user_only" = "no"; then  if test "$target_user_only" = "no"; then

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com