Diff for /qemu/configure between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2018/04/24 16:42:43 version 1.1.1.5, 2018/04/24 16:44:57
Line 22  interp_prefix="/usr/gnemul/qemu-%M" Line 22  interp_prefix="/usr/gnemul/qemu-%M"
 static="no"  static="no"
 cross_prefix=""  cross_prefix=""
 cc="gcc"  cc="gcc"
   gcc3_search="yes"
   gcc3_list="gcc-3.4 gcc34 gcc-3.3 gcc33 gcc-3.2 gcc32"
 host_cc="gcc"  host_cc="gcc"
 ar="ar"  ar="ar"
 make="make"  make="make"
Line 88  bsd="no" Line 90  bsd="no"
 linux="no"  linux="no"
 kqemu="no"  kqemu="no"
 profiler="no"  profiler="no"
 kernel_path=""  
 cocoa="no"  cocoa="no"
 check_gfx="yes"  check_gfx="yes"
 check_gcc="yes"  check_gcc="yes"
 softmmu="yes"  softmmu="yes"
 user="no"  linux_user="no"
   darwin_user="no"
 build_docs="no"  build_docs="no"
 build_acpi_tables="no"  
 uname_release=""  uname_release=""
   
 # OS specific  # OS specific
Line 103  targetos=`uname -s` Line 104  targetos=`uname -s`
 case $targetos in  case $targetos in
 CYGWIN*)  CYGWIN*)
 mingw32="yes"  mingw32="yes"
 CFLAGS="-O2 -mno-cygwin"  OS_CFLAGS="-mno-cygwin"
 ;;  ;;
 MINGW32*)  MINGW32*)
 mingw32="yes"  mingw32="yes"
Line 126  oss="yes" Line 127  oss="yes"
 Darwin)  Darwin)
 bsd="yes"  bsd="yes"
 darwin="yes"  darwin="yes"
   darwin_user="yes"
   cocoa="yes"
   coreaudio="yes"
   OS_CFLAGS="-mdynamic-no-pic"
 ;;  ;;
 SunOS)  SunOS)
 solaris="yes"  solaris="yes"
Line 133  solaris="yes" Line 138  solaris="yes"
 *)  *)
 oss="yes"  oss="yes"
 linux="yes"  linux="yes"
 user="yes"  linux_user="yes"
 if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then  if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     kqemu="yes"      kqemu="yes"
 fi  fi
Line 150  if [ "$solaris" = "yes" ] ; then Line 155  if [ "$solaris" = "yes" ] ; then
     make="gmake"      make="gmake"
     install="ginstall"      install="ginstall"
     solarisrev=`uname -r | cut -f2 -d.`      solarisrev=`uname -r | cut -f2 -d.`
       if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
           if test "$solarisrev" -gt 10 ; then
               kqemu="yes"
           fi
       fi
 fi  fi
   
 # find source path  # find source path
Line 180  for opt do Line 190  for opt do
   --cross-prefix=*) cross_prefix="$optarg"    --cross-prefix=*) cross_prefix="$optarg"
   ;;    ;;
   --cc=*) cc="$optarg"    --cc=*) cc="$optarg"
     gcc3_search="no"
   ;;    ;;
   --host-cc=*) host_cc="$optarg"    --host-cc=*) host_cc="$optarg"
   ;;    ;;
Line 223  for opt do Line 234  for opt do
   ;;    ;;
   --enable-profiler) profiler="yes"    --enable-profiler) profiler="yes"
   ;;    ;;
   --kernel-path=*) kernel_path="$optarg"  
   ;;  
   --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"    --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
   ;;    ;;
   --disable-gfx-check) check_gfx="no"    --disable-gfx-check) check_gfx="no"
Line 235  for opt do Line 244  for opt do
   ;;    ;;
   --enable-system) softmmu="yes"    --enable-system) softmmu="yes"
   ;;    ;;
   --disable-user) user="no"    --disable-linux-user) linux_user="no"
   ;;    ;;
   --enable-user) user="yes"    --enable-linux-user) linux_user="yes"
   ;;    ;;
   --enable-uname-release=*) uname_release="$optarg"    --disable-darwin-user) darwin_user="no"
     ;;
     --enable-darwin-user) darwin_user="yes"
   ;;    ;;
   --enable-iasl) build_acpi_tables="yes"    --enable-uname-release=*) uname_release="$optarg"
   ;;    ;;
   esac    esac
 done  done
   
 # Checking for CFLAGS  # default flags for all hosts
 if test -z "$CFLAGS"; then  CFLAGS="$CFLAGS -Wall -O2 -g -fno-strict-aliasing"
     CFLAGS="-O2"  LDFLAGS="$LDFLAGS -g"
 fi  
   
 if test x"$show_help" = x"yes" ; then  if test x"$show_help" = x"yes" ; then
 cat << EOF  cat << EOF
Line 267  echo "  --target-list=LIST       set tar Line 277  echo "  --target-list=LIST       set tar
 echo ""  echo ""
 echo "kqemu kernel acceleration support:"  echo "kqemu kernel acceleration support:"
 echo "  --disable-kqemu          disable kqemu support"  echo "  --disable-kqemu          disable kqemu support"
 echo "  --kernel-path=PATH       set the kernel path (configure probes it)"  
 echo ""  echo ""
 echo "Advanced options (experts only):"  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]"
Line 286  echo "  --enable-fmod            enable  Line 295  echo "  --enable-fmod            enable 
 echo "  --enabled-dsound         enable DirectSound audio driver"  echo "  --enabled-dsound         enable DirectSound audio driver"
 echo "  --enable-system          enable all system emulation targets"  echo "  --enable-system          enable all system emulation targets"
 echo "  --disable-system         disable all system emulation targets"  echo "  --disable-system         disable all system emulation targets"
 echo "  --enable-user            enable all linux usermode emulation targets"  echo "  --enable-linux-user      enable all linux usermode emulation targets"
 echo "  --disable-user           disable all linux usermode emulation targets"  echo "  --disable-linux-user     disable all linux usermode emulation targets"
   echo "  --enable-darwin-user     enable all darwin usermode emulation targets"
   echo "  --disable-darwin-user    disable all darwin 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-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 built at the place where configure is launched"
 exit 1  exit 1
 fi  fi
   
Line 322  if test "$mingw32" = "yes" ; then Line 332  if test "$mingw32" = "yes" ; then
     fi      fi
 fi  fi
   
   # Check for gcc4, error if pre-gcc4 
   if test "$check_gcc" = "yes" ; then
       cat > $TMPC <<EOF
   #if __GNUC__ < 4
   #error gcc3
   #endif
   int main(){return 0;}
   EOF
       check_cc() {
           which "$1" >&/dev/null
           return $?
       }
   
       if "$cc" -o $TMPE $TMPC 2>/dev/null ; then
           echo "WARNING: \"$cc\" looks like gcc 4.x"
           found_compat_cc="no"
           if test "$gcc3_search" = "yes" ; then
               echo "Looking for gcc 3.x"
               for compat_cc in $gcc3_list ; do
                   if check_cc "$compat_cc" ; then
                       echo "Found \"$compat_cc\""
                       cc="$compat_cc"
                       found_compat_cc="yes"
                       break
                   fi
               done
               if test "$found_compat_cc" = "no" ; then
                   echo "gcc 3.x not found!"
               fi
           fi
           if test "$found_compat_cc" = "no" ; then
               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
   fi
   
 #  #
 # Solaris specific configure tool chain decisions  # Solaris specific configure tool chain decisions
 #  #
Line 369  if test -z "$target_list" ; then Line 418  if test -z "$target_list" ; then
         target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu arm-softmmu"          target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu arm-softmmu"
     fi      fi
 # the following are Linux specific  # the following are Linux specific
     if [ "$user" = "yes" ] ; then      if [ "$linux_user" = "yes" ] ; then
         target_list="i386-user arm-user armeb-user sparc-user ppc-user mips-user mipsel-user $target_list"          target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user ppc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user $target_list"
       fi
   # the following are Darwin specific
       if [ "$darwin_user" = "yes" ] ; then
           target_list="i386-darwin-user ppc-darwin-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 424  if $cc -fno-reorder-blocks -fno-optimize Line 477  if $cc -fno-reorder-blocks -fno-optimize
    have_gcc3_options="yes"     have_gcc3_options="yes"
 fi  fi
   
 # Check for gcc4, error if pre-gcc4   
 if test "$check_gcc" = "yes" ; then  
     cat > $TMPC <<EOF  
 #if __GNUC__ < 4  
 #error gcc3  
 #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 469  _sdlversion=`$sdl_config --version | sed Line 505  _sdlversion=`$sdl_config --version | sed
 if test "$_sdlversion" -lt 121 ; then  if test "$_sdlversion" -lt 121 ; then
 sdl_too_old=yes  sdl_too_old=yes
 else  else
 sdl=yes   if test "$cocoa" = "no" ; then
      sdl=yes
    fi
 fi  fi
   
 # static link with sdl ?  # static link with sdl ?
Line 490  fi # static link Line 528  fi # static link
 fi # sdl compile test  fi # sdl compile test
   
 fi # cross compilation  fi # cross compilation
   
   else
    # Make sure to disable cocoa if sdl was set
    if test "$sdl" = "yes" ; then
      cocoa="no"
      coreaudio="no"
    fi
 fi # -z $sdl  fi # -z $sdl
   
   ##########################################
   # alsa sound support libraries
   
   if test "$alsa" = "yes" ; then
     cat > $TMPC << EOF
   #include <alsa/asoundlib.h>
   int main(void) { snd_pcm_t **handle; return snd_pcm_close(*handle); }
   EOF
     if $cc -o $TMPE $TMPC -lasound 2> /dev/null ; then
       :
     else
       echo
       echo "Error: Could not find alsa"
       echo "Make sure to have the alsa libs and headers installed."
       echo
       exit 1
     fi
   fi
   
 # Check if tools are available to build documentation.  # Check if tools are available to build documentation.
 if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then  if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then
   build_docs="yes"    build_docs="yes"
Line 593  fi Line 657  fi
 echo "HOST_CC=$host_cc" >> $config_mak  echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak  echo "AR=$ar" >> $config_mak
 echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak  echo "STRIP=$strip -s -R .comment -R .note" >> $config_mak
   echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
 echo "CFLAGS=$CFLAGS" >> $config_mak  echo "CFLAGS=$CFLAGS" >> $config_mak
 echo "LDFLAGS=$LDFLAGS" >> $config_mak  echo "LDFLAGS=$LDFLAGS" >> $config_mak
 echo "EXESUF=$EXESUF" >> $config_mak  echo "EXESUF=$EXESUF" >> $config_mak
Line 712  echo "TARGET_DIRS=$target_list" >> $conf Line 777  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 738  target_bigendian="no" Line 800  target_bigendian="no"
 [ "$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_cpu" = "sh4eb" ] && target_bigendian=yes
   [ "$target_cpu" = "m68k" ] && 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 747  if expr $target : '.*-user' > /dev/null  Line 810  if expr $target : '.*-user' > /dev/null 
   target_user_only="yes"    target_user_only="yes"
 fi  fi
   
   target_linux_user="no"
   if expr $target : '.*-linux-user' > /dev/null ; then
     target_linux_user="yes"
   fi
   
   target_darwin_user="no"
   if expr $target : '.*-darwin-user' > /dev/null ; then
     target_darwin_user="yes"
   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"
Line 759  fi Line 832  fi
   
 mkdir -p $target_dir  mkdir -p $target_dir
 mkdir -p $target_dir/fpu  mkdir -p $target_dir/fpu
 if test "$target" = "arm-user" -o "$target" = "armeb-user" ; then  if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" ; then
   mkdir -p $target_dir/nwfpe    mkdir -p $target_dir/nwfpe
 fi  fi
 if test "$target_user_only" = "no" ; then  if test "$target_user_only" = "no" ; then
Line 833  elif test "$target_cpu" = "sh4" -o "$tar Line 906  elif test "$target_cpu" = "sh4" -o "$tar
   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"    bflt="yes"
   elif test "$target_cpu" = "m68k" ; then
     echo "TARGET_ARCH=m68k" >> $config_mak
     echo "#define TARGET_ARCH \"m68k\"" >> $config_h
     echo "#define TARGET_M68K 1" >> $config_h
     bflt="yes"
 else  else
   echo "Unsupported target CPU"    echo "Unsupported target CPU"
   exit 1    exit 1
Line 849  if test "$target_user_only" = "yes" ; th Line 927  if test "$target_user_only" = "yes" ; th
   echo "CONFIG_USER_ONLY=yes" >> $config_mak    echo "CONFIG_USER_ONLY=yes" >> $config_mak
   echo "#define CONFIG_USER_ONLY 1" >> $config_h    echo "#define CONFIG_USER_ONLY 1" >> $config_h
 fi  fi
   if test "$target_linux_user" = "yes" ; then
     echo "CONFIG_LINUX_USER=yes" >> $config_mak
     echo "#define CONFIG_LINUX_USER 1" >> $config_h
   fi
   if test "$target_darwin_user" = "yes" ; then
     echo "CONFIG_DARWIN_USER=yes" >> $config_mak
     echo "#define CONFIG_DARWIN_USER 1" >> $config_h
   fi
   
 if test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" -o "$target_cpu" = "sparc" -o "$target_cpu" = "sparc64"; then  if test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" -o "$target_cpu" = "sparc" -o "$target_cpu" = "sparc64" -o "$target_cpu" = "m68k"; 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

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


unix.superglobalmegacorp.com