Diff for /qemu/configure between versions 1.1.1.4 and 1.1.1.6

version 1.1.1.4, 2018/04/24 16:42:43 version 1.1.1.6, 2018/04/24 16:47:22
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.6 gcc-3.4 gcc34 gcc-3.3.6 gcc-3.3 gcc33 gcc-3.2 gcc32"
 host_cc="gcc"  host_cc="gcc"
 ar="ar"  ar="ar"
 make="make"  make="make"
Line 48  case "$cpu" in Line 50  case "$cpu" in
   mips)    mips)
     cpu="mips"      cpu="mips"
   ;;    ;;
   s390)    mips64)
       cpu="mips64"
     ;;
     cris)
       cpu="cris"
     ;;
     s390*)
     cpu="s390"      cpu="s390"
   ;;    ;;
   sparc|sun4[muv])    sparc|sun4[cdmuv])
     cpu="sparc"      cpu="sparc"
   ;;    ;;
   sparc64)    sparc64)
Line 84  alsa="no" Line 92  alsa="no"
 fmod="no"  fmod="no"
 fmod_lib=""  fmod_lib=""
 fmod_inc=""  fmod_inc=""
   vnc_tls="yes"
 bsd="no"  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 111  targetos=`uname -s`
 case $targetos in  case $targetos in
 CYGWIN*)  CYGWIN*)
 mingw32="yes"  mingw32="yes"
 CFLAGS="-O2 -mno-cygwin"  OS_CFLAGS="-mno-cygwin"
   VL_OS_LDFLAGS="-mno-cygwin"
   if [ "$cpu" = "i386" ] ; then
       kqemu="yes"
   fi
 ;;  ;;
 MINGW32*)  MINGW32*)
 mingw32="yes"  mingw32="yes"
   if [ "$cpu" = "i386" ] ; then
       kqemu="yes"
   fi
   ;;
   GNU/kFreeBSD)
   oss="yes"
   if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
       kqemu="yes"
   fi
 ;;  ;;
 FreeBSD)  FreeBSD)
 bsd="yes"  bsd="yes"
Line 126  oss="yes" Line 147  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"
       make="gmake"
       install="ginstall"
       needs_libsunmath="no"
       solarisrev=`uname -r | cut -f2 -d.`
       # have to select again, because `uname -m` returns i86pc
       # even on an x86_64 box.
       solariscpu=`isainfo -k`
       if test "${solariscpu}" = "amd64" ; then
           cpu="x86_64"
       fi
       if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
           if test "$solarisrev" -le 9 ; then
               if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then
                   needs_libsunmath="yes"
               else
                   echo "QEMU will not link correctly on Solaris 8/X86 or 9/x86 without"
                   echo "libsunmath from the Sun Studio compilers tools, due to a lack of"
                   echo "C99 math features in libm.so in Solaris 8/x86 and Solaris 9/x86"
                   echo "Studio 11 can be downloaded from www.sun.com."
                   exit 1
               fi
           fi
           if test "$solarisrev" -ge 9 ; then
               kqemu="yes"
           fi
       fi
       if test -f /usr/include/sys/soundcard.h ; then
           oss=yes
       fi
 ;;  ;;
 *)  *)
 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 146  if [ "$bsd" = "yes" ] ; then Line 200  if [ "$bsd" = "yes" ] ; then
   fi    fi
 fi  fi
   
 if [ "$solaris" = "yes" ] ; then  
     make="gmake"  
     install="ginstall"  
     solarisrev=`uname -r | cut -f2 -d.`  
 fi  
   
 # find source path  # find source path
 source_path=`dirname "$0"`  source_path=`dirname "$0"`
 if [ -z "$source_path" ]; then  if [ -z "$source_path" ]; then
Line 165  else Line 213  else
     source_path_used="yes"      source_path_used="yes"
 fi  fi
   
   werror="no"
   # generate compile errors on warnings for development builds
   #if grep cvs $source_path/VERSION > /dev/null 2>&1 ; then
   #werror="yes";
   #fi
   
 for opt do  for opt do
   optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`    optarg=`expr "x$opt" : 'x[^=]*=\(.*\)'`
   case "$opt" in    case "$opt" in
Line 180  for opt do Line 234  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 213  for opt do Line 268  for opt do
   ;;    ;;
   --fmod-inc=*) fmod_inc="$optarg"    --fmod-inc=*) fmod_inc="$optarg"
   ;;    ;;
   --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; user="no"    --disable-vnc-tls) vnc_tls="no"
     ;;
     --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-" ; linux_user="no"
   ;;    ;;
   --disable-slirp) slirp="no"    --disable-slirp) slirp="no"
   ;;    ;;
Line 223  for opt do Line 280  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 290  for opt do
   ;;    ;;
   --enable-system) softmmu="yes"    --enable-system) softmmu="yes"
   ;;    ;;
   --disable-user) user="no"    --disable-linux-user) linux_user="no"
     ;;
     --enable-linux-user) linux_user="yes"
     ;;
     --disable-darwin-user) darwin_user="no"
   ;;    ;;
   --enable-user) user="yes"    --enable-darwin-user) darwin_user="yes"
   ;;    ;;
   --enable-uname-release=*) uname_release="$optarg"    --enable-uname-release=*) uname_release="$optarg"
   ;;    ;;
   --enable-iasl) build_acpi_tables="yes"    --sparc_cpu=*)
         sparc_cpu="$optarg"
         case $sparc_cpu in
           v7|v8) SP_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
                    target_cpu="sparc"; cpu="sparc" ;;
           v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32"
                    target_cpu="sparc"; cpu="sparc" ;;
           v9)    SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64"
                    target_cpu="sparc64"; cpu="sparc64" ;;
           *)     echo "undefined SPARC architecture. Exiting";exit 1;;
         esac
     ;;
     --enable-werror) werror="yes"
     ;;
     --disable-werror) werror="no"
     ;;
     *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;    ;;
   esac    esac
 done  done
   
 # Checking for CFLAGS  if [ "$bsd" = "yes" -o "$darwin" = "yes" -o "$mingw32" = "yes" ] ; then
 if test -z "$CFLAGS"; then      AIOLIBS=
     CFLAGS="-O2"  else
       # Some Linux architectures (e.g. s390) don't imply -lpthread automatically.
       AIOLIBS="-lrt -lpthread"
   fi
   
   # default flags for all hosts
   CFLAGS="$CFLAGS -Wall -O2 -g -fno-strict-aliasing"
   LDFLAGS="$LDFLAGS -g"
   if test "$werror" = "yes" ; then
   CFLAGS="$CFLAGS -Werror"
   fi
   
   #
   # If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
   # ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
   #
   case $cpu in
       sparc) if test -z "$sparc_cpu" ; then
                  ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
                  ARCH_LDFLAGS="-m32"
              else
                  ARCH_CFLAGS="${SP_CFLAGS}"
                  ARCH_LDFLAGS="${SP_LDFLAGS}"
              fi
              ;;
       sparc64) if test -z "$sparc_cpu" ; then
                  ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__"
                  ARCH_LDFLAGS="-m64"
              else
                  ARCH_CFLAGS="${SP_CFLAGS}"
                  ARCH_LDFLAGS="${SP_LDFLAGS}"
              fi
              ;;
       s390)
              ARCH_CFLAGS="-march=z900"
              ;;
   esac
   
   if [ "$solaris" = "yes" -a  "$cpu" = "x86_64" ] ; then
       CFLAGS="${CFLAGS} -m64"
       OS_CFLAGS="${OS_CFLAGS} -m64"
       OS_LDFLAGS="${OS_LDFLAGS} -m64"
   fi
   
   if [ "$solaris" = "yes" -a  "$cpu" = "i386" ] ; then
       CFLAGS="${CFLAGS} -m32"
       OS_CFLAGS="${OS_CFLAGS} -m32"
 fi  fi
   
 if test x"$show_help" = x"yes" ; then  if test x"$show_help" = x"yes" ; then
Line 267  echo "  --target-list=LIST       set tar Line 388  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 277  echo "  --host-cc=CC             use C c Line 397  echo "  --host-cc=CC             use C c
 echo "  --make=MAKE              use specified make [$make]"  echo "  --make=MAKE              use specified make [$make]"
 echo "  --install=INSTALL        use specified install [$install]"  echo "  --install=INSTALL        use specified install [$install]"
 echo "  --static                 enable static build [$static]"  echo "  --static                 enable static build [$static]"
   echo "  --disable-werror         disable compilation abort on warning"
   echo "  --disable-sdl            disable SDL"
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"  echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 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-coreaudio       enable Coreaudio audio driver"  echo "  --enable-coreaudio       enable Coreaudio audio driver"
 echo "  --enable-alsa            enable ALSA audio driver"  echo "  --enable-alsa            enable ALSA audio driver"
 echo "  --enable-fmod            enable FMOD audio driver"  echo "  --enable-fmod            enable FMOD audio driver"
 echo "  --enabled-dsound         enable DirectSound audio driver"  echo "  --enable-dsound          enable DirectSound audio driver"
   echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
 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 "  --sparc_cpu=V            Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
 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 306  cat > $TMPC <<EOF Line 431  cat > $TMPC <<EOF
 int main(void) {}  int main(void) {}
 EOF  EOF
   
 if $cc -c -o $TMPO $TMPC 2>/dev/null ; then  if $cc -c -o $TMPO $TMPC 2> /dev/null ; then
   : C compiler works ok    : C compiler works ok
 else  else
     echo "ERROR: \"$cc\" either does not exist or does not work"      echo "ERROR: \"$cc\" either does not exist or does not work"
Line 317  if test "$mingw32" = "yes" ; then Line 442  if test "$mingw32" = "yes" ; then
     linux="no"      linux="no"
     EXESUF=".exe"      EXESUF=".exe"
     oss="no"      oss="no"
     if [ "$cpu" = "i386" ] ; then  fi
         kqemu="yes"  
   # 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 $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 "$cross_prefix$compat_cc" --version 2> /dev/null | fgrep '(GCC) 3.' > /dev/null 2>&1 ; then
                       echo "Found \"$compat_cc\""
                       cc="$cross_prefix$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
 fi  fi
   
Line 329  if test "$solaris" = "yes" ; then Line 485  if test "$solaris" = "yes" ; then
   #    #
   # gcc for solaris 10/fcs in /usr/sfw/bin doesn't compile qemu correctly    # gcc for solaris 10/fcs in /usr/sfw/bin doesn't compile qemu correctly
   # override the check with --disable-gcc-check    # override the check with --disable-gcc-check
   #     #
   if test "$solarisrev" -eq 10 -a "$check_gcc" = "yes" ; then    if test "$solarisrev" -eq 10 -a "$check_gcc" = "yes" ; then
     solgcc=`which $cc`      solgcc=`which $cc`
     if test "$solgcc" = "/usr/sfw/bin/gcc" ; then      if test "$solgcc" = "/usr/sfw/bin/gcc" ; then
Line 360  if test "$solaris" = "yes" ; then Line 516  if test "$solaris" = "yes" ; then
     fi      fi
     exit 1      exit 1
   fi    fi
 fi   fi
   
   
 if test -z "$target_list" ; then  if test -z "$target_list" ; then
 # these targets are portable  # these targets are portable
     if [ "$softmmu" = "yes" ] ; then      if [ "$softmmu" = "yes" ] ; then
         target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu arm-softmmu"          target_list="i386-softmmu sparc-softmmu x86_64-softmmu mips-softmmu mipsel-softmmu mips64-softmmu mips64el-softmmu arm-softmmu ppc-softmmu ppcemb-softmmu ppc64-softmmu m68k-softmmu sh4-softmmu sh4eb-softmmu cris-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 sparc64-linux-user sparc32plus-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user sh4-linux-user sh4eb-linux-user ppc-linux-user ppc64-linux-user ppc64abi32-linux-user x86_64-linux-user cris-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 392  int main(int argc, char ** argv){ Line 552  int main(int argc, char ** argv){
 }  }
 EOF  EOF
   
 if $cc -o $TMPE $TMPC 2>/dev/null ; then  if $cc -o $TMPE $TMPC 2> /dev/null ; then
 $TMPE && bigendian="yes"  $TMPE && bigendian="yes"
 else  else
 echo big/little test failed  echo big/little test failed
Line 401  fi Line 561  fi
 else  else
   
 # if cross compiling, cannot launch a program, so make a static guess  # if cross compiling, cannot launch a program, so make a static guess
 if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k" -o "$cpu" = "armv4b"; then  if test "$cpu" = "powerpc" -o "$cpu" = "mips" -o "$cpu" = "mips64" -o "$cpu" = "s390" -o "$cpu" = "sparc" -o "$cpu" = "sparc64" -o "$cpu" = "m68k" -o "$cpu" = "armv4b"; then
     bigendian="yes"      bigendian="yes"
 fi  fi
   
Line 419  int main(void) { Line 579  int main(void) {
 }  }
 EOF  EOF
   
 have_gcc3_options="no"  
 if $cc -fno-reorder-blocks -fno-optimize-sibling-calls -o $TMPO $TMPC 2> /dev/null ; then  
    have_gcc3_options="yes"  
 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
   
 sdl_too_old=no  sdl_too_old=no
   
 if test -z "$sdl" ; then  if test -z "$sdl" ; then
       sdl_config="sdl-config"
 sdl_config="sdl-config"      sdl=no
 sdl=no      sdl_static=no
 sdl_static=no  
       if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then
 if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then      # win32 cross compilation case
 # win32 cross compilation case          sdl_config="i386-mingw32msvc-sdl-config"
     sdl_config="i386-mingw32msvc-sdl-config"          sdl=yes
     sdl=yes      else
 else          # normal SDL probe
 # normal SDL probe  
 cat > $TMPC << EOF  cat > $TMPC << EOF
 #include <SDL.h>  #include <SDL.h>
 #undef main /* We don't want SDL to override our main() */  #undef main /* We don't want SDL to override our main() */
 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }  int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
 EOF  EOF
           if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then
 if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /dev/null ; then              _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`              if test "$_sdlversion" -lt 121 ; then
 if test "$_sdlversion" -lt 121 ; then                  sdl_too_old=yes
 sdl_too_old=yes              else
                   if test "$cocoa" = "no" ; then
                       sdl=yes
                   fi
               fi
   
               # static link with sdl ?
               if test "$sdl" = "yes" ; then
                   aa="no"
                   `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
                   sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
                   if [ "$aa" = "yes" ] ; then
                       sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
                   fi
   
                   if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then
                       sdl_static=yes
                   fi
               fi # static link
           fi # sdl compile test
       fi # cross compilation
 else  else
 sdl=yes      # Make sure to disable cocoa if sdl was set
 fi      if test "$sdl" = "yes" ; then
          cocoa="no"
 # static link with sdl ?         coreaudio="no"
 if test "$sdl" = "yes" ; then      fi
 aa="no"  fi # -z $sdl
 `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes"  
 sdl_static_libs=`$sdl_config --static-libs`  
 if [ "$aa" = "yes" ] ; then  
   sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"  
 fi  
   
 if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then  ##########################################
   sdl_static=yes  # VNC TLS detection
   if test "$vnc_tls" = "yes" ; then
     `pkg-config gnutls` || vnc_tls="no"
   fi
   if test "$vnc_tls" = "yes" ; then
     vnc_tls_cflags=`pkg-config --cflags gnutls`
     vnc_tls_libs=`pkg-config --libs gnutls`
 fi  fi
   
 fi # static link  ##########################################
   # alsa sound support libraries
 fi # sdl compile test  
   
 fi # cross compilation  if test "$alsa" = "yes" ; then
 fi # -z $sdl    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 2>/dev/null`" ] && \
      [ -x "`which pod2man 2>/dev/null`" ]; then
   build_docs="yes"    build_docs="yes"
 fi  fi
   
 if test "$mingw32" = "yes" ; then  if test "$mingw32" = "yes" ; then
 if test -z "$prefix" ; then    if test -z "$prefix" ; then
     prefix="/c/Program Files/Qemu"        prefix="/c/Program Files/Qemu"
 fi    fi
 mandir="$prefix"    mansuffix=""
 datadir="$prefix"    datasuffix=""
 docdir="$prefix"    docsuffix=""
 bindir="$prefix"    binsuffix=""
 else  else
 if test -z "$prefix" ; then    if test -z "$prefix" ; then
     prefix="/usr/local"        prefix="/usr/local"
 fi    fi
 mandir="$prefix/share/man"    mansuffix="/share/man"
 datadir="$prefix/share/qemu"    datasuffix="/share/qemu"
 docdir="$prefix/share/doc/qemu"    docsuffix="/share/doc/qemu"
 bindir="$prefix/bin"    binsuffix="/bin"
 fi  fi
   
 echo "Install prefix    $prefix"  echo "Install prefix    $prefix"
 echo "BIOS directory    $datadir"  echo "BIOS directory    $prefix$datasuffix"
 echo "binary directory  $bindir"  echo "binary directory  $prefix$binsuffix"
 if test "$mingw32" = "no" ; then  if test "$mingw32" = "no" ; then
 echo "Manual directory  $mandir"  echo "Manual directory  $prefix$mansuffix"
 echo "ELF interp prefix $interp_prefix"  echo "ELF interp prefix $interp_prefix"
 fi  fi
 echo "Source path       $source_path"  echo "Source path       $source_path"
Line 533  echo "target list       $target_list" Line 704  echo "target list       $target_list"
 echo "gprof enabled     $gprof"  echo "gprof enabled     $gprof"
 echo "profiler          $profiler"  echo "profiler          $profiler"
 echo "static build      $static"  echo "static build      $static"
   echo "-Werror enabled   $werror"
 if test "$darwin" = "yes" ; then  if test "$darwin" = "yes" ; then
     echo "Cocoa support     $cocoa"      echo "Cocoa support     $cocoa"
 fi  fi
Line 558  else Line 730  else
     fmod_support=""      fmod_support=""
 fi  fi
 echo "FMOD support      $fmod $fmod_support"  echo "FMOD support      $fmod $fmod_support"
   echo "OSS support       $oss"
   echo "VNC TLS support   $vnc_tls"
   if test "$vnc_tls" = "yes" ; then
       echo "    TLS CFLAGS    $vnc_tls_cflags"
       echo "    TLS LIBS      $vnc_tls_libs"
   fi
   if test -n "$sparc_cpu"; then
       echo "Target Sparc Arch $sparc_cpu"
   fi
 echo "kqemu support     $kqemu"  echo "kqemu support     $kqemu"
 echo "Documentation     $build_docs"  echo "Documentation     $build_docs"
 [ ! -z "$uname_release" ] && \  [ ! -z "$uname_release" ] && \
Line 566  echo "uname -r          $uname_release" Line 747  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"
 fi  fi
   if [ -s /tmp/qemu-$$-sdl-config.log ]; then
     echo "The error log from compiling the libSDL test is: "
     cat /tmp/qemu-$$-sdl-config.log
   fi
   rm -f /tmp/qemu-$$-sdl-config.log
 #if test "$sdl_static" = "no"; then  #if test "$sdl_static" = "no"; then
 #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"  #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
 #fi  #fi
Line 574  config_h="config-host.h" Line 760  config_h="config-host.h"
   
 #echo "Creating $config_mak and $config_h"  #echo "Creating $config_mak and $config_h"
   
   test -f $config_h && mv $config_h ${config_h}~
   
 echo "# Automatically generated by configure - do not modify" > $config_mak  echo "# Automatically generated by configure - do not modify" > $config_mak
 echo "# Configured with: $0 $@" >> $config_mak  echo "# Configured with: $0 $@" >> $config_mak
 echo "/* Automatically generated by configure - do not modify */" > $config_h  echo "/* Automatically generated by configure - do not modify */" > $config_h
   
 echo "prefix=$prefix" >> $config_mak  echo "prefix=$prefix" >> $config_mak
 echo "bindir=$bindir" >> $config_mak  echo "bindir=\${prefix}$binsuffix" >> $config_mak
 echo "mandir=$mandir" >> $config_mak  echo "mandir=\${prefix}$mansuffix" >> $config_mak
 echo "datadir=$datadir" >> $config_mak  echo "datadir=\${prefix}$datasuffix" >> $config_mak
 echo "docdir=$docdir" >> $config_mak  echo "docdir=\${prefix}$docsuffix" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h  echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
 echo "MAKE=$make" >> $config_mak  echo "MAKE=$make" >> $config_mak
 echo "INSTALL=$install" >> $config_mak  echo "INSTALL=$install" >> $config_mak
 echo "CC=$cc" >> $config_mak  echo "CC=$cc" >> $config_mak
 if test "$have_gcc3_options" = "yes" ; then  
   echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak  
 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 "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak
   echo "VL_OS_LDFLAGS=$VL_OS_LDFLAGS" >> $config_mak
   echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
   echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $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
   echo "AIOLIBS=$AIOLIBS" >> $config_mak
 if test "$cpu" = "i386" ; then  if test "$cpu" = "i386" ; then
   echo "ARCH=i386" >> $config_mak    echo "ARCH=i386" >> $config_mak
   echo "#define HOST_I386 1" >> $config_h    echo "#define HOST_I386 1" >> $config_h
Line 614  elif test "$cpu" = "powerpc" ; then Line 805  elif test "$cpu" = "powerpc" ; then
 elif test "$cpu" = "mips" ; then  elif test "$cpu" = "mips" ; then
   echo "ARCH=mips" >> $config_mak    echo "ARCH=mips" >> $config_mak
   echo "#define HOST_MIPS 1" >> $config_h    echo "#define HOST_MIPS 1" >> $config_h
   elif test "$cpu" = "mips64" ; then
     echo "ARCH=mips64" >> $config_mak
     echo "#define HOST_MIPS64 1" >> $config_h
   elif test "$cpu" = "cris" ; then
     echo "ARCH=cris" >> $config_mak
     echo "#define HOST_CRIS 1" >> $config_h
 elif test "$cpu" = "s390" ; then  elif test "$cpu" = "s390" ; then
   echo "ARCH=s390" >> $config_mak    echo "ARCH=s390" >> $config_mak
   echo "#define HOST_S390 1" >> $config_h    echo "#define HOST_S390 1" >> $config_h
Line 633  elif test "$cpu" = "m68k" ; then Line 830  elif test "$cpu" = "m68k" ; then
   echo "ARCH=m68k" >> $config_mak    echo "ARCH=m68k" >> $config_mak
   echo "#define HOST_M68K 1" >> $config_h    echo "#define HOST_M68K 1" >> $config_h
 else  else
   echo "Unsupported CPU"    echo "Unsupported CPU = $cpu"
   exit 1    exit 1
 fi  fi
 if test "$bigendian" = "yes" ; then  if test "$bigendian" = "yes" ; then
Line 644  echo "#define HOST_LONG_BITS $hostlongbi Line 841  echo "#define HOST_LONG_BITS $hostlongbi
 if test "$mingw32" = "yes" ; then  if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=yes" >> $config_mak    echo "CONFIG_WIN32=yes" >> $config_mak
   echo "#define CONFIG_WIN32 1" >> $config_h    echo "#define CONFIG_WIN32 1" >> $config_h
 elif test -f "/usr/include/byteswap.h" ; then  else
   echo "#define HAVE_BYTESWAP_H 1" >> $config_h    cat > $TMPC << EOF
   #include <byteswap.h>
   int main(void) { return bswap_32(0); }
   EOF
     if $cc -o $TMPE $TMPC 2> /dev/null ; then
       echo "#define HAVE_BYTESWAP_H 1" >> $config_h
     fi
 fi  fi
 if test "$darwin" = "yes" ; then  if test "$darwin" = "yes" ; then
   echo "CONFIG_DARWIN=yes" >> $config_mak    echo "CONFIG_DARWIN=yes" >> $config_mak
Line 654  fi Line 857  fi
 if test "$solaris" = "yes" ; then  if test "$solaris" = "yes" ; then
   echo "CONFIG_SOLARIS=yes" >> $config_mak    echo "CONFIG_SOLARIS=yes" >> $config_mak
   echo "#define HOST_SOLARIS $solarisrev" >> $config_h    echo "#define HOST_SOLARIS $solarisrev" >> $config_h
     if test "$needs_libsunmath" = "yes" ; then
       echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
       echo "#define NEEDS_LIBSUNMATH 1" >> $config_h
     fi
   fi
   if test -n "$sparc_cpu"; then
     echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak
     echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
 fi  fi
 if test "$gdbstub" = "yes" ; then  if test "$gdbstub" = "yes" ; then
   echo "CONFIG_GDBSTUB=yes" >> $config_mak    echo "CONFIG_GDBSTUB=yes" >> $config_mak
Line 700  if test "$fmod" = "yes" ; then Line 911  if test "$fmod" = "yes" ; then
   echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak    echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
   echo "#define CONFIG_FMOD 1" >> $config_h    echo "#define CONFIG_FMOD 1" >> $config_h
 fi  fi
   if test "$vnc_tls" = "yes" ; then
     echo "CONFIG_VNC_TLS=yes" >> $config_mak
     echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
     echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
     echo "#define CONFIG_VNC_TLS 1" >> $config_h
   fi
 qemu_version=`head $source_path/VERSION`  qemu_version=`head $source_path/VERSION`
 echo "VERSION=$qemu_version" >>$config_mak  echo "VERSION=$qemu_version" >>$config_mak
 echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h  echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
Line 712  echo "TARGET_DIRS=$target_list" >> $conf Line 929  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  if test "$static" = "yes"; then
   echo "BUILD_ACPI_TABLES=yes" >> $config_mak    sdl1=$sdl_static
   else
     sdl1=$sdl
   fi
   if test "$sdl1" = "yes" ; then
     echo "#define CONFIG_SDL 1" >> $config_h
     echo "CONFIG_SDL=yes" >> $config_mak
     if test "$target_softmmu" = "no" -o "$static" = "yes"; then
       echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
     else
       echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
     fi
     if [ "${aa}" = "yes" ] ; then
       echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak
     else
       echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
     fi
   fi
   if test "$cocoa" = "yes" ; then
       echo "#define CONFIG_COCOA 1" >> $config_h
       echo "CONFIG_COCOA=yes" >> $config_mak
 fi  fi
   
 # XXX: suppress that  # XXX: suppress that
Line 725  fi Line 962  fi
   
 echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h  echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
   
   tools=
   if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
     tools="qemu-img\$(EXESUF) $tools"
   fi
   echo "TOOLS=$tools" >> $config_mak
   
   test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $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 734  target_bigendian="no" Line 979  target_bigendian="no"
 [ "$target_cpu" = "armeb" ] && target_bigendian=yes  [ "$target_cpu" = "armeb" ] && target_bigendian=yes
 [ "$target_cpu" = "sparc" ] && target_bigendian=yes  [ "$target_cpu" = "sparc" ] && target_bigendian=yes
 [ "$target_cpu" = "sparc64" ] && target_bigendian=yes  [ "$target_cpu" = "sparc64" ] && target_bigendian=yes
   [ "$target_cpu" = "sparc32plus" ] && target_bigendian=yes
 [ "$target_cpu" = "ppc" ] && target_bigendian=yes  [ "$target_cpu" = "ppc" ] && target_bigendian=yes
   [ "$target_cpu" = "ppcemb" ] && target_bigendian=yes
 [ "$target_cpu" = "ppc64" ] && target_bigendian=yes  [ "$target_cpu" = "ppc64" ] && target_bigendian=yes
   [ "$target_cpu" = "ppc64abi32" ] && target_bigendian=yes
 [ "$target_cpu" = "mips" ] && target_bigendian=yes  [ "$target_cpu" = "mips" ] && target_bigendian=yes
   [ "$target_cpu" = "mipsn32" ] && target_bigendian=yes
   [ "$target_cpu" = "mips64" ] && 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  
   target_softmmu="yes"  
 fi  
 target_user_only="no"  target_user_only="no"
 if expr $target : '.*-user' > /dev/null ; then  target_linux_user="no"
   target_user_only="yes"  target_darwin_user="no"
 fi  case "$target" in
     ${target_cpu}-softmmu)
       target_softmmu="yes"
       ;;
     ${target_cpu}-linux-user)
       target_user_only="yes"
       target_linux_user="yes"
       ;;
     ${target_cpu}-darwin-user)
       target_user_only="yes"
       target_darwin_user="yes"
       ;;
     *)
       echo "ERROR: Target '$target' not recognised"
       exit 1
       ;;
   esac
   
 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
Line 757  fi Line 1021  fi
   
 #echo "Creating $config_mak, $config_h and $target_dir/Makefile"  #echo "Creating $config_mak, $config_h and $target_dir/Makefile"
   
   test -f $config_h && mv $config_h ${config_h}~
   
 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  
   mkdir -p $target_dir/slirp  
 fi  
   
 #  #
 # don't use ln -sf as not all "ln -sf" over write the file/link  # don't use ln -sf as not all "ln -sf" over write the file/link
Line 781  echo "include ../config-host.mak" >> $co Line 1044  echo "include ../config-host.mak" >> $co
 echo "#include \"../config-host.h\"" >> $config_h  echo "#include \"../config-host.h\"" >> $config_h
   
 bflt="no"  bflt="no"
   elfload32="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 805  elif test "$target_cpu" = "sparc64" ; th Line 1069  elif test "$target_cpu" = "sparc64" ; th
   echo "#define TARGET_ARCH \"sparc64\"" >> $config_h    echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
   echo "#define TARGET_SPARC 1" >> $config_h    echo "#define TARGET_SPARC 1" >> $config_h
   echo "#define TARGET_SPARC64 1" >> $config_h    echo "#define TARGET_SPARC64 1" >> $config_h
     elfload32="yes"
   elif test "$target_cpu" = "sparc32plus" ; then
     echo "TARGET_ARCH=sparc64" >> $config_mak
     echo "TARGET_ABI_DIR=sparc" >> $config_mak
     echo "TARGET_ARCH2=sparc32plus" >> $config_mak
     echo "#define TARGET_ARCH \"sparc64\"" >> $config_h
     echo "#define TARGET_SPARC 1" >> $config_h
     echo "#define TARGET_SPARC64 1" >> $config_h
     echo "#define TARGET_ABI32 1" >> $config_h
 elif test "$target_cpu" = "ppc" ; then  elif test "$target_cpu" = "ppc" ; then
   echo "TARGET_ARCH=ppc" >> $config_mak    echo "TARGET_ARCH=ppc" >> $config_mak
   echo "#define TARGET_ARCH \"ppc\"" >> $config_h    echo "#define TARGET_ARCH \"ppc\"" >> $config_h
   echo "#define TARGET_PPC 1" >> $config_h    echo "#define TARGET_PPC 1" >> $config_h
   elif test "$target_cpu" = "ppcemb" ; then
     echo "TARGET_ARCH=ppcemb" >> $config_mak
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
     echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
     echo "#define TARGET_PPC 1" >> $config_h
     echo "#define TARGET_PPCEMB 1" >> $config_h
 elif test "$target_cpu" = "ppc64" ; then  elif test "$target_cpu" = "ppc64" ; then
   echo "TARGET_ARCH=ppc64" >> $config_mak    echo "TARGET_ARCH=ppc64" >> $config_mak
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
   echo "#define TARGET_ARCH \"ppc64\"" >> $config_h    echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
   echo "#define TARGET_PPC 1" >> $config_h    echo "#define TARGET_PPC 1" >> $config_h
   echo "#define TARGET_PPC64 1" >> $config_h    echo "#define TARGET_PPC64 1" >> $config_h
   elif test "$target_cpu" = "ppc64abi32" ; then
     echo "TARGET_ARCH=ppc64" >> $config_mak
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
     echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
     echo "#define TARGET_ARCH \"ppc64\"" >> $config_h
     echo "#define TARGET_PPC 1" >> $config_h
     echo "#define TARGET_PPC64 1" >> $config_h
     echo "#define TARGET_ABI32 1" >> $config_h
 elif test "$target_cpu" = "x86_64" ; then  elif test "$target_cpu" = "x86_64" ; then
   echo "TARGET_ARCH=x86_64" >> $config_mak    echo "TARGET_ARCH=x86_64" >> $config_mak
   echo "#define TARGET_ARCH \"x86_64\"" >> $config_h    echo "#define TARGET_ARCH \"x86_64\"" >> $config_h
Line 826  elif test "$target_cpu" = "mips" -o "$ta Line 1114  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
     echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
   elif test "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" ; then
     echo "TARGET_ARCH=mipsn32" >> $config_mak
     echo "#define TARGET_ARCH \"mipsn32\"" >> $config_h
     echo "#define TARGET_MIPS 1" >> $config_h
     echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
   elif test "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el" ; then
     echo "TARGET_ARCH=mips64" >> $config_mak
     echo "#define TARGET_ARCH \"mips64\"" >> $config_h
     echo "#define TARGET_MIPS 1" >> $config_h
     echo "#define TARGET_MIPS64 1" >> $config_h
     echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
   elif test "$target_cpu" = "cris" ; then
     echo "TARGET_ARCH=cris" >> $config_mak
     echo "#define TARGET_ARCH \"cris\"" >> $config_h
     echo "#define TARGET_CRIS 1" >> $config_h
   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
 elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then  elif test "$target_cpu" = "sh4" -o "$target_cpu" = "sh4eb" ; then
Line 833  elif test "$target_cpu" = "sh4" -o "$tar Line 1137  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"
   elif test "$target_cpu" = "alpha" ; then
     echo "TARGET_ARCH=alpha" >> $config_mak
     echo "#define TARGET_ARCH \"alpha\"" >> $config_h
     echo "#define TARGET_ALPHA 1" >> $config_h
 else  else
   echo "Unsupported target CPU"    echo "Unsupported target CPU"
   exit 1    exit 1
Line 849  if test "$target_user_only" = "yes" ; th Line 1162  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" = "sparc32plus" -o "$target_cpu" = "m68k" -o "$target_cpu" = "mips" -o "$target_cpu" = "mipsel" -o "$target_cpu" = "mipsn32" -o "$target_cpu" = "mipsn32el" -o "$target_cpu" = "mips64" -o "$target_cpu" = "mips64el"; 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
Line 858  if test "$target_user_only" = "yes" -a " Line 1179  if test "$target_user_only" = "yes" -a "
   echo "TARGET_HAS_BFLT=yes" >> $config_mak    echo "TARGET_HAS_BFLT=yes" >> $config_mak
   echo "#define TARGET_HAS_BFLT 1" >> $config_h    echo "#define TARGET_HAS_BFLT 1" >> $config_h
 fi  fi
 # sdl defines  # 32 bit ELF loader in addition to native 64 bit loader?
   if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
 if test "$target_user_only" = "no"; then    echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak
     if test "$target_softmmu" = "no" -o "$static" = "yes"; then    echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h
         sdl1=$sdl_static  
     else  
         sdl1=$sdl  
     fi  
     if test "$sdl1" = "yes" ; then  
         echo "#define CONFIG_SDL 1" >> $config_h  
         echo "CONFIG_SDL=yes" >> $config_mak  
         if test "$target_softmmu" = "no" -o "$static" = "yes"; then  
             echo "SDL_LIBS=$sdl_static_libs" >> $config_mak  
         else  
             echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak  
         fi  
         if [ "${aa}" = "yes" ] ; then  
             echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak  
         else  
             echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak  
         fi  
     fi  
 fi  fi
   
 if test "$cocoa" = "yes" ; then  test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h
     echo "#define CONFIG_COCOA 1" >> $config_h  
     echo "CONFIG_COCOA=yes" >> $config_mak  
 fi  
   
 done # for target in $targets  done # for target in $targets
   
 # build tree in object directory if source path is different from current one  # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then  if test "$source_path_used" = "yes" ; then
     DIRS="tests"      DIRS="tests tests/cris slirp audio"
     FILES="Makefile tests/Makefile"      FILES="Makefile tests/Makefile"
       FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
     for dir in $DIRS ; do      for dir in $DIRS ; do
             mkdir -p $dir              mkdir -p $dir
     done      done

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


unix.superglobalmegacorp.com