Diff for /qemu/configure between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2018/04/24 16:37:52 version 1.1.1.2, 2018/04/24 16:38:31
Line 77  gdbstub="yes" Line 77  gdbstub="yes"
 slirp="yes"  slirp="yes"
 adlib="no"  adlib="no"
 oss="no"  oss="no"
   dsound="no"
   coreaudio="no"
   alsa="no"
 fmod="no"  fmod="no"
 fmod_lib=""  fmod_lib=""
 fmod_inc=""  fmod_inc=""
Line 85  kqemu="no" Line 88  kqemu="no"
 kernel_path=""  kernel_path=""
 cocoa="no"  cocoa="no"
 check_gfx="yes"  check_gfx="yes"
   check_gcc="yes"
   
 # OS specific  # OS specific
 targetos=`uname -s`  targetos=`uname -s`
Line 115  Darwin) Line 119  Darwin)
 bsd="yes"  bsd="yes"
 darwin="yes"  darwin="yes"
 ;;  ;;
 *)   *)
 oss="yes"  oss="yes"
 linux="yes"  linux="yes"
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then  if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
Line 131  if [ "$bsd" = "yes" ] ; then Line 135  if [ "$bsd" = "yes" ] ; then
 fi  fi
   
 # find source path  # find source path
 # XXX: we assume an absolute path is given when launching configure,   # XXX: we assume an absolute path is given when launching configure,
 # except in './configure' case.  # except in './configure' case.
 source_path=${0%configure}  source_path=${0%configure}
 source_path=${source_path%/}  source_path=${source_path%/}
Line 143  fi Line 147  fi
   
 for opt do  for opt do
   case "$opt" in    case "$opt" in
     --help|-h) show_help=yes
     ;;
   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`    --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
   ;;    ;;
   --interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2`    --interp-prefix=*) interp_prefix=`echo $opt | cut -d '=' -f 2`
Line 171  for opt do Line 177  for opt do
   ;;    ;;
   --disable-sdl) sdl="no"    --disable-sdl) sdl="no"
   ;;    ;;
     --enable-coreaudio) coreaudio="yes"
     ;;
     --enable-alsa) alsa="yes"
     ;;
     --enable-dsound) dsound="yes"
     ;;
   --enable-fmod) fmod="yes"    --enable-fmod) fmod="yes"
   ;;    ;;
   --fmod-lib=*) fmod_lib=${opt#--fmod-lib=}    --fmod-lib=*) fmod_lib=${opt#--fmod-lib=}
Line 178  for opt do Line 190  for opt do
   --fmod-inc=*) fmod_inc=${opt#--fmod-inc=}    --fmod-inc=*) fmod_inc=${opt#--fmod-inc=}
   ;;    ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"    --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
   ;;     ;;
   --disable-slirp) slirp="no"    --disable-slirp) slirp="no"
   ;;     ;;
   --enable-adlib) adlib="yes"    --enable-adlib) adlib="yes"
   ;;     ;;
   --disable-kqemu) kqemu="no"    --disable-kqemu) kqemu="no"
   ;;     ;;
   --kernel-path=*) kernel_path=${opt#--kernel-path=}    --kernel-path=*) kernel_path=${opt#--kernel-path=}
   ;;     ;;
   --enable-cocoa) cocoa="yes" ; sdl="no"    --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
   ;;     ;;
   --disable-gfx-check) check_gfx="no"    --disable-gfx-check) check_gfx="no"
   ;;    ;;
     --disable-gcc-check) check_gcc="no"
     ;;
   esac    esac
 done  done
   
Line 215  fi Line 229  fi
   
 if test -z "$target_list" ; then  if test -z "$target_list" ; then
 # these targets are portable  # these targets are portable
     target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu"      target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu arm-softmmu"
 # the following are Linux specific  # the following are Linux specific
     if [ "$linux" = "yes" ] ; then      if [ "$linux" = "yes" ] ; then
         target_list="i386-user arm-user armeb-user sparc-user ppc-user $target_list"          target_list="i386-user arm-user armeb-user sparc-user ppc-user mips-user mipsel-user $target_list"
     fi      fi
 else  else
     target_list=$(echo "$target_list" | sed -e 's/,/ /g')      target_list=$(echo "$target_list" | sed -e 's/,/ /g')
Line 231  if test -z "$cross_prefix" ; then Line 245  if test -z "$cross_prefix" ; then
 cat > $TMPC << EOF  cat > $TMPC << EOF
 #include <inttypes.h>  #include <inttypes.h>
 int main(int argc, char ** argv){  int main(int argc, char ** argv){
         volatile uint32_t i=0x01234567;          volatile uint32_t i=0x01234567;
         return (*((uint8_t*)(&i))) == 0x67;          return (*((uint8_t*)(&i))) == 0x67;
 }  }
 EOF  EOF
   
Line 268  if $cc -fno-reorder-blocks -fno-optimize Line 282  if $cc -fno-reorder-blocks -fno-optimize
    have_gcc3_options="yes"     have_gcc3_options="yes"
 fi  fi
   
   # Check for gcc4
   if test "$check_gcc" = "yes" ; then
       cat > $TMPC <<EOF
   #if __GNUC__ >= 4
   #error gcc4
   #endif
   int main(){return 0;}
   EOF
       if ! $cc -o $TMPO $TMPC 2>/dev/null ; then
           echo "ERROR: \"$cc\" looks like gcc 4.x"
           echo "QEMU is known to have problems when compiled with gcc 4.x"
           echo "It is recommended that you use gcc 3.x to build QEMU"
           echo "To use this compiler anyway, configure with --disable-gcc-check"
           exit 1;
       fi
   fi
   
 ##########################################  ##########################################
 # SDL probe  # SDL probe
   
Line 319  fi # sdl compile test Line 350  fi # sdl compile test
 fi # cross compilation  fi # cross compilation
 fi # -z $sdl  fi # -z $sdl
   
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then  if test x"$show_help" = x"yes" ; then
 cat << EOF  cat << EOF
   
 Usage: configure [options]  Usage: configure [options]
Line 341  echo "Advanced options (experts only):" Line 372  echo "Advanced options (experts only):"
 echo "  --source-path=PATH       path of source code [$source_path]"  echo "  --source-path=PATH       path of source code [$source_path]"
 echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"  echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
 echo "  --cc=CC                  use C compiler CC [$cc]"  echo "  --cc=CC                  use C compiler CC [$cc]"
 echo "  --host-cc=CC             use C compiler CC [$cc] for dyngen etc."  echo "  --host-cc=CC             use C compiler CC [$host_cc] for dyngen etc."
 echo "  --make=MAKE              use specified make [$make]"  echo "  --make=MAKE              use specified make [$make]"
 echo "  --static                 enable static build [$static]"  echo "  --static                 enable static build [$static]"
 echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"  echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
 echo "  --enable-adlib           enable Adlib emulation"  echo "  --enable-adlib           enable Adlib emulation"
 echo "  --enable-fmod            enable FMOD audio output driver"  echo "  --enable-coreaudio       enable Coreaudio audio driver"
   echo "  --enable-alsa            enable ALSA audio driver"
   echo "  --enable-fmod            enable FMOD audio driver"
   echo "  --enabled-dsound         enable DirectSound audio driver"
 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 ""  echo ""
Line 375  fi Line 409  fi
 # kqemu support  # kqemu support
 if test $kqemu = "yes" ; then  if test $kqemu = "yes" ; then
     # test if the source code is installed      # test if the source code is installed
     if test '!' -f "kqemu/Makefile" ; then       if test '!' -f "kqemu/Makefile" ; then
         kqemu="no"          kqemu="no"
     fi      fi
 fi  fi
     
 # Linux specific kqemu configuration  # Linux specific kqemu configuration
 if test $kqemu = "yes" -a $linux = "yes" ; then  if test $kqemu = "yes" -a $linux = "yes" ; then
 # find the kernel path  # find the kernel path
 if test -z "$kernel_path" ; then  if test -z "$kernel_path" ; then
 kernel_version=`uname -r`  kernel_version=`uname -r`
 kernel_path="/lib/modules/$kernel_version/build"  kernel_path="/lib/modules/$kernel_version/build"
 if test '!' -d "$kernel_path/include" ; then   if test '!' -d "$kernel_path/include" ; then
     kernel_path="/usr/src/linux"      kernel_path="/usr/src/linux"
     if test '!' -d "$kernel_path/include" ; then       if test '!' -d "$kernel_path/include" ; then
         echo "Could not find kernel includes in /lib/modules or /usr/src/linux - cannot build the kqemu module"          echo "Could not find kernel includes in /lib/modules or /usr/src/linux - cannot build the kqemu module"
         kqemu="no"          kqemu="no"
     fi      fi
Line 401  if test $kqemu = "yes" ; then Line 435  if test $kqemu = "yes" ; then
 if test '!' -f "$kernel_path/Makefile" ; then  if test '!' -f "$kernel_path/Makefile" ; then
     echo "No Makefile file present in $kernel_path - kqemu cannot be built"      echo "No Makefile file present in $kernel_path - kqemu cannot be built"
     kqemu="no"      kqemu="no"
 fi      fi
   
 # find build system (2.6 or legacy)  # find build system (2.6 or legacy)
 kbuild26="yes"  kbuild26="yes"
Line 439  if test "$sdl" != "no" ; then Line 473  if test "$sdl" != "no" ; then
 fi  fi
 echo "mingw32 support   $mingw32"  echo "mingw32 support   $mingw32"
 echo "Adlib support     $adlib"  echo "Adlib support     $adlib"
   echo "CoreAudio support $coreaudio"
   echo "ALSA support      $alsa"
   echo "DSound support    $dsound"
 echo -n "FMOD support      $fmod"  echo -n "FMOD support      $fmod"
 if test $fmod = "yes"; then  if test "$fmod" = "yes"; then
       if test -z $fmod_lib || test -z $fmod_inc; then
           echo
           echo "Error: You must specify path to FMOD library and headers"
           echo "Example: --fmod-inc=/path/include/fmod --fmod-lib=/path/lib/libfmod-3.74.so"
           echo
           exit 1
       fi
     echo -n " (lib='$fmod_lib' include='$fmod_inc')"      echo -n " (lib='$fmod_lib' include='$fmod_inc')"
 fi  fi
 echo ""  echo ""
Line 568  if test "$oss" = "yes" ; then Line 612  if test "$oss" = "yes" ; then
   echo "CONFIG_OSS=yes" >> $config_mak    echo "CONFIG_OSS=yes" >> $config_mak
   echo "#define CONFIG_OSS 1" >> $config_h    echo "#define CONFIG_OSS 1" >> $config_h
 fi  fi
   if test "$coreaudio" = "yes" ; then
     echo "CONFIG_COREAUDIO=yes" >> $config_mak
     echo "#define CONFIG_COREAUDIO 1" >> $config_h
   fi
   if test "$alsa" = "yes" ; then
     echo "CONFIG_ALSA=yes" >> $config_mak
     echo "#define CONFIG_ALSA 1" >> $config_h
   fi
   if test "$dsound" = "yes" ; then
     echo "CONFIG_DSOUND=yes" >> $config_mak
     echo "#define CONFIG_DSOUND 1" >> $config_h
   fi
 if test "$fmod" = "yes" ; then  if test "$fmod" = "yes" ; then
   echo "CONFIG_FMOD=yes" >> $config_mak    echo "CONFIG_FMOD=yes" >> $config_mak
   echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak    echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
Line 600  if [ "$bsd" = "yes" ] ; then Line 656  if [ "$bsd" = "yes" ] ; then
   echo "#define _BSD 1" >> $config_h    echo "#define _BSD 1" >> $config_h
 fi  fi
   
 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 623  if expr $target : '.*-user' > /dev/null  Line 679  if expr $target : '.*-user' > /dev/null 
 fi  fi
   
 if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \  if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \
         -a "$sdl" = "no" -a "$cocoa" = "no" ; then          -a "$sdl" = "no" -a "$cocoa" = "no" ; then
     echo "ERROR: QEMU requires SDL or Cocoa for graphical output"      echo "ERROR: QEMU requires SDL or Cocoa for graphical output"
     echo "To build QEMU with graphical output configure with --disable-gfx-check"      echo "To build QEMU with graphical output configure with --disable-gfx-check"
     echo "Note that this will disable all output from the virtual graphics card."      echo "Note that this will disable all output from the virtual graphics card."
Line 690  elif test "$target_cpu" = "x86_64" ; the Line 746  elif test "$target_cpu" = "x86_64" ; the
   if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"  ; then    if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"  ; then
     echo "#define USE_KQEMU 1" >> $config_h      echo "#define USE_KQEMU 1" >> $config_h
   fi    fi
 elif test "$target_cpu" = "mips" ; then  elif test "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" ; then
   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

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


unix.superglobalmegacorp.com