Diff for /qemu/configure between versions 1.1.1.11 and 1.1.1.13

version 1.1.1.11, 2018/04/24 17:34:29 version 1.1.1.13, 2018/04/24 18:24:03
Line 15  TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$- Line 15  TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-
 TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"  TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"
 TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe"  TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe"
   
 trap "rm -f $TMPC $TMPO $TMPE ; exit" 0 2 3 15  trap "rm -f $TMPC $TMPO $TMPE ; exit" EXIT INT QUIT TERM
   
 compile_object() {  compile_object() {
   $cc $QEMU_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null    $cc $QEMU_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null
Line 27  compile_prog() { Line 27  compile_prog() {
   $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null    $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null
 }  }
   
   # check whether a command is available to this shell (may be either an
   # executable or a builtin)
   has() {
       type "$1" >/dev/null 2>&1
   }
   
   # search for an executable in PATH
   path_of() {
       local_command="$1"
       local_ifs="$IFS"
       local_dir=""
   
       # pathname has a dir component?
       if [ "${local_command#*/}" != "$local_command" ]; then
           if [ -x "$local_command" ] && [ ! -d "$local_command" ]; then
               echo "$local_command"
               return 0
           fi
       fi
       if [ -z "$local_command" ]; then
           return 1
       fi
   
       IFS=:
       for local_dir in $PATH; do
           if [ -x "$local_dir/$local_command" ] && [ ! -d "$local_dir/$local_command" ]; then
               echo "$local_dir/$local_command"
               IFS="${local_ifs:-$(printf ' \t\n')}"
               return 0
           fi
       done
       # not found
       IFS="${local_ifs:-$(printf ' \t\n')}"
       return 1
   }
   
 # default parameters  # default parameters
 cpu=""  cpu=""
 prefix=""  
 interp_prefix="/usr/gnemul/qemu-%M"  interp_prefix="/usr/gnemul/qemu-%M"
 static="no"  static="no"
 sparc_cpu=""  sparc_cpu=""
Line 97  CFLAGS="-g $CFLAGS" Line 132  CFLAGS="-g $CFLAGS"
 QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"  QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
 QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"  QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
 QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"  QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
 QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"  QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
 QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"  QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS"
 LDFLAGS="-g $LDFLAGS"  LDFLAGS="-g $LDFLAGS"
   
 gcc_flags="-Wold-style-declaration -Wold-style-definition"  gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all"
 cat > $TMPC << EOF  cat > $TMPC << EOF
 int main(void) { }  int main(void) { return 0; }
 EOF  EOF
 for flag in $gcc_flags; do  for flag in $gcc_flags; do
     if compile_prog "$QEMU_CFLAGS" "$flag" ; then      if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
         QEMU_CFLAGS="$flag $QEMU_CFLAGS"          QEMU_CFLAGS="$flag $QEMU_CFLAGS"
     fi      fi
 done  done
Line 156  elif check_define _ARCH_PPC ; then Line 191  elif check_define _ARCH_PPC ; then
   fi    fi
 elif check_define __mips__ ; then  elif check_define __mips__ ; then
   cpu="mips"    cpu="mips"
   elif check_define __ia64__ ; then
     cpu="ia64"
   elif check_define __s390__ ; then
     if check_define __s390x__ ; then
       cpu="s390x"
     else
       cpu="s390"
     fi
 else  else
   cpu=`uname -m`    cpu=`uname -m`
 fi  fi
Line 193  case "$cpu" in Line 236  case "$cpu" in
     cpu="sparc"      cpu="sparc"
   ;;    ;;
   *)    *)
     cpu="unknown"      echo "Unsupported CPU = $cpu"
       exit 1
   ;;    ;;
 esac  esac
   
Line 216  curses="" Line 260  curses=""
 docs=""  docs=""
 fdt=""  fdt=""
 kvm=""  kvm=""
   kvm_para=""
 nptl=""  nptl=""
 sdl=""  sdl=""
 sparse="no"  sparse="no"
Line 223  uuid="" Line 268  uuid=""
 vde=""  vde=""
 vnc_tls=""  vnc_tls=""
 vnc_sasl=""  vnc_sasl=""
   vnc_jpeg=""
   vnc_png=""
   vnc_thread="no"
 xen=""  xen=""
 linux_aio=""  linux_aio=""
   attr=""
   vhost_net=""
   
 gprof="no"  gprof="no"
 debug_tcg="no"  debug_tcg="no"
   debug_mon="no"
 debug="no"  debug="no"
 strip_opt="yes"  strip_opt="yes"
 bigendian="no"  bigendian="no"
 mingw32="no"  mingw32="no"
 EXESUF=""  EXESUF=""
   prefix="/usr/local"
   mandir="\${prefix}/share/man"
   datadir="\${prefix}/share/qemu"
   docdir="\${prefix}/share/doc/qemu"
   bindir="\${prefix}/bin"
   sysconfdir="\${prefix}/etc"
   confsuffix="/qemu"
 slirp="yes"  slirp="yes"
 fmod_lib=""  fmod_lib=""
 fmod_inc=""  fmod_inc=""
Line 293  FreeBSD) Line 351  FreeBSD)
   make="gmake"    make="gmake"
   audio_drv_list="oss"    audio_drv_list="oss"
   audio_possible_drivers="oss sdl esd pa"    audio_possible_drivers="oss sdl esd pa"
     # needed for kinfo_getvmmap(3) in libutil.h
     LIBS="-lutil $LIBS"
 ;;  ;;
 DragonFly)  DragonFly)
   bsd="yes"    bsd="yes"
Line 402  fi Line 462  fi
 if test "$mingw32" = "yes" ; then  if test "$mingw32" = "yes" ; then
   EXESUF=".exe"    EXESUF=".exe"
   QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"    QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
     # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)
     QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
   LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"    LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
     prefix="c:/Program Files/Qemu"
     mandir="\${prefix}"
     datadir="\${prefix}"
     docdir="\${prefix}"
     bindir="\${prefix}"
     sysconfdir="\${prefix}"
     confsuffix=""
 fi  fi
   
 # find source path  # find source path
Line 450  for opt do Line 519  for opt do
   ;;    ;;
   --enable-gprof) gprof="yes"    --enable-gprof) gprof="yes"
   ;;    ;;
   --static) static="yes"    --static)
       static="yes"
       LDFLAGS="-static $LDFLAGS"
     ;;
     --mandir=*) mandir="$optarg"
     ;;
     --bindir=*) bindir="$optarg"
     ;;
     --datadir=*) datadir="$optarg"
     ;;
     --docdir=*) docdir="$optarg"
     ;;
     --sysconfdir=*) sysconfdir="$optarg"
   ;;    ;;
   --disable-sdl) sdl="no"    --disable-sdl) sdl="no"
   ;;    ;;
Line 472  for opt do Line 553  for opt do
   ;;    ;;
   --disable-debug-tcg) debug_tcg="no"    --disable-debug-tcg) debug_tcg="no"
   ;;    ;;
     --enable-debug-mon) debug_mon="yes"
     ;;
     --disable-debug-mon) debug_mon="no"
     ;;
   --enable-debug)    --enable-debug)
       # Enable debugging options that aren't excessively noisy        # Enable debugging options that aren't excessively noisy
       debug_tcg="yes"        debug_tcg="yes"
         debug_mon="yes"
       debug="yes"        debug="yes"
       strip_opt="no"        strip_opt="no"
   ;;    ;;
Line 492  for opt do Line 578  for opt do
   ;;    ;;
   --enable-vnc-sasl) vnc_sasl="yes"    --enable-vnc-sasl) vnc_sasl="yes"
   ;;    ;;
     --disable-vnc-jpeg) vnc_jpeg="no"
     ;;
     --enable-vnc-jpeg) vnc_jpeg="yes"
     ;;
     --disable-vnc-png) vnc_png="no"
     ;;
     --enable-vnc-png) vnc_png="yes"
     ;;
     --disable-vnc-thread) vnc_thread="no"
     ;;
     --enable-vnc-thread) vnc_thread="yes"
     ;;
   --disable-slirp) slirp="no"    --disable-slirp) slirp="no"
   ;;    ;;
   --disable-uuid) uuid="no"    --disable-uuid) uuid="no"
Line 589  for opt do Line 687  for opt do
   ;;    ;;
   --enable-linux-aio) linux_aio="yes"    --enable-linux-aio) linux_aio="yes"
   ;;    ;;
     --disable-attr) attr="no"
     ;;
     --enable-attr) attr="yes"
     ;;
   --enable-io-thread) io_thread="yes"    --enable-io-thread) io_thread="yes"
   ;;    ;;
   --disable-blobs) blobs="no"    --disable-blobs) blobs="no"
Line 601  for opt do Line 703  for opt do
   ;;    ;;
   --enable-docs) docs="yes"    --enable-docs) docs="yes"
   ;;    ;;
     --disable-vhost-net) vhost_net="no"
     ;;
     --enable-vhost-net) vhost_net="yes"
     ;;
     --*dir)
     ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"    *) echo "ERROR: unknown option $opt"; show_help="yes"
   ;;    ;;
   esac    esac
Line 638  case "$cpu" in Line 746  case "$cpu" in
            fi             fi
            ;;             ;;
     s390)      s390)
            QEMU_CFLAGS="-march=z900 $QEMU_CFLAGS"             QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"
              LDFLAGS="-m31 $LDFLAGS"
              host_guest_base="yes"
              ;;
       s390x)
              QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS"
              LDFLAGS="-m64 $LDFLAGS"
              host_guest_base="yes"
            ;;             ;;
     i386)      i386)
            QEMU_CFLAGS="-m32 $QEMU_CFLAGS"             QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
Line 657  case "$cpu" in Line 772  case "$cpu" in
     ppc*)      ppc*)
            host_guest_base="yes"             host_guest_base="yes"
            ;;             ;;
       mips*)
              host_guest_base="yes"
              ;;
       ia64*)
              host_guest_base="yes"
              ;;
       hppa*)
              host_guest_base="yes"
              ;;
 esac  esac
   
 [ -z "$guest_base" ] && guest_base="$host_guest_base"  [ -z "$guest_base" ] && guest_base="$host_guest_base"
Line 679  echo "Advanced options (experts only):" Line 803  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 [$host_cc] for dyngen etc."  echo "  --host-cc=CC             use C compiler CC [$host_cc] for code run at"
   echo "                           build time"
 echo "  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS"  echo "  --extra-cflags=CFLAGS    append extra C compiler flags QEMU_CFLAGS"
 echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"  echo "  --extra-ldflags=LDFLAGS  append extra linker flags LDFLAGS"
 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 "  --mandir=PATH            install man pages in PATH"
   echo "  --datadir=PATH           install firmware in PATH"
   echo "  --docdir=PATH            install documentation in PATH"
   echo "  --bindir=PATH            install binaries in PATH"
   echo "  --sysconfdir=PATH        install config in PATH/qemu"
 echo "  --enable-debug-tcg       enable TCG debugging"  echo "  --enable-debug-tcg       enable TCG debugging"
 echo "  --disable-debug-tcg      disable TCG debugging (default)"  echo "  --disable-debug-tcg      disable TCG debugging (default)"
 echo "  --enable-debug           enable common debug build options"  echo "  --enable-debug           enable common debug build options"
Line 710  echo "  --disable-vnc-tls        disable Line 840  echo "  --disable-vnc-tls        disable
 echo "  --enable-vnc-tls         enable TLS encryption for VNC server"  echo "  --enable-vnc-tls         enable TLS encryption for VNC server"
 echo "  --disable-vnc-sasl       disable SASL encryption for VNC server"  echo "  --disable-vnc-sasl       disable SASL encryption for VNC server"
 echo "  --enable-vnc-sasl        enable SASL encryption for VNC server"  echo "  --enable-vnc-sasl        enable SASL encryption for VNC server"
   echo "  --disable-vnc-jpeg       disable JPEG lossy compression for VNC server"
   echo "  --enable-vnc-jpeg        enable JPEG lossy compression for VNC server"
   echo "  --disable-vnc-png        disable PNG compression for VNC server (default)"
   echo "  --enable-vnc-png         enable PNG compression for VNC server"
   echo "  --disable-vnc-thread     disable threaded VNC server"
   echo "  --enable-vnc-thread      enable threaded VNC server"
 echo "  --disable-curses         disable curses output"  echo "  --disable-curses         disable curses output"
 echo "  --enable-curses          enable curses output"  echo "  --enable-curses          enable curses output"
 echo "  --disable-curl           disable curl connectivity"  echo "  --disable-curl           disable curl connectivity"
Line 750  echo "  --disable-vde            disable Line 886  echo "  --disable-vde            disable
 echo "  --enable-vde             enable support for vde network"  echo "  --enable-vde             enable support for vde network"
 echo "  --disable-linux-aio      disable Linux AIO support"  echo "  --disable-linux-aio      disable Linux AIO support"
 echo "  --enable-linux-aio       enable Linux AIO support"  echo "  --enable-linux-aio       enable Linux AIO support"
   echo "  --disable-attr           disables attr and xattr support"
   echo "  --enable-attr            enable attr and xattr support"
 echo "  --enable-io-thread       enable IO thread"  echo "  --enable-io-thread       enable IO thread"
 echo "  --disable-blobs          disable installing provided firmware blobs"  echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --kerneldir=PATH         look for kernel includes in PATH"  echo "  --kerneldir=PATH         look for kernel includes in PATH"
   echo "  --enable-docs            enable documentation build"
   echo "  --disable-docs           disable documentation build"
   echo "  --disable-vhost-net      disable vhost-net acceleration support"
   echo "  --enable-vhost-net       enable vhost-net acceleration support"
 echo ""  echo ""
 echo "NOTE: The object files are built 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
Line 762  fi Line 904  fi
 # Solaris specific configure tool chain decisions  # Solaris specific configure tool chain decisions
 #  #
 if test "$solaris" = "yes" ; then  if test "$solaris" = "yes" ; then
   solinst=`which $install 2> /dev/null | /usr/bin/grep -v "no $install in"`    if has $install; then
   if test -z "$solinst" ; then      :
     else
     echo "Solaris install program not found. Use --install=/usr/ucb/install or"      echo "Solaris install program not found. Use --install=/usr/ucb/install or"
     echo "install fileutils from www.blastwave.org using pkg-get -i fileutils"      echo "install fileutils from www.blastwave.org using pkg-get -i fileutils"
     echo "to get ginstall which is used by default (which lives in /opt/csw/bin)"      echo "to get ginstall which is used by default (which lives in /opt/csw/bin)"
     exit 1      exit 1
   fi    fi
   if test "$solinst" = "/usr/sbin/install" ; then    if test "`path_of $install`" = "/usr/sbin/install" ; then
     echo "Error: Solaris /usr/sbin/install is not an appropriate install program."      echo "Error: Solaris /usr/sbin/install is not an appropriate install program."
     echo "try ginstall from the GNU fileutils available from www.blastwave.org"      echo "try ginstall from the GNU fileutils available from www.blastwave.org"
     echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install"      echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install"
     exit 1      exit 1
   fi    fi
   sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"`    if has ar; then
   if test -z "$sol_ar" ; then      :
     else
     echo "Error: No path includes ar"      echo "Error: No path includes ar"
     if test -f /usr/ccs/bin/ar ; then      if test -f /usr/ccs/bin/ar ; then
       echo "Add /usr/ccs/bin to your path and rerun configure"        echo "Add /usr/ccs/bin to your path and rerun configure"
Line 852  if test -z "$target_list" ; then Line 996  if test -z "$target_list" ; then
     echo "No targets enabled"      echo "No targets enabled"
     exit 1      exit 1
 fi  fi
   # see if system emulation was really requested
   case " $target_list " in
     *"-softmmu "*) softmmu=yes
     ;;
     *) softmmu=no
     ;;
   esac
   
 feature_not_found() {  feature_not_found() {
   feature=$1    feature=$1
Line 965  EOF Line 1116  EOF
 fi  fi
   
 ##########################################  ##########################################
   # pkgconfig probe
   
   pkgconfig="${cross_prefix}pkg-config"
   if ! has $pkgconfig; then
     # likely not cross compiling, or hope for the best
     pkgconfig=pkg-config
   fi
   
   ##########################################
 # Sparse probe  # Sparse probe
 if test "$sparse" != "no" ; then  if test "$sparse" != "no" ; then
   if test -x "$(which cgcc 2>/dev/null)"; then    if has cgcc; then
     sparse=yes      sparse=yes
   else    else
     if test "$sparse" = "yes" ; then      if test "$sparse" = "yes" ; then
Line 980  fi Line 1140  fi
 ##########################################  ##########################################
 # SDL probe  # SDL probe
   
 sdl_too_old=no  # Look for sdl configuration program (pkg-config or sdl-config).
   # Prefer variant with cross prefix if cross compiling,
   # and favour pkg-config with sdl over sdl-config.
   if test -n "$cross_prefix" -a $pkgconfig != pkg-config && \
        $pkgconfig sdl --modversion >/dev/null 2>&1; then
     sdlconfig="$pkgconfig sdl"
     _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
   elif test -n "$cross_prefix" && has ${cross_prefix}sdl-config; then
     sdlconfig="${cross_prefix}sdl-config"
     _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
   elif $pkgconfig sdl --modversion >/dev/null 2>&1; then
     sdlconfig="$pkgconfig sdl"
     _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`
   elif has sdl-config; then
     sdlconfig='sdl-config'
     _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'`
   else
     if test "$sdl" = "yes" ; then
       feature_not_found "sdl"
     fi
     sdl=no
   fi
   
   sdl_too_old=no
 if test "$sdl" != "no" ; then  if test "$sdl" != "no" ; then
   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
   sdl_cflags=`sdl-config --cflags 2> /dev/null`    sdl_cflags=`$sdlconfig --cflags 2> /dev/null`
   sdl_libs=`sdl-config --libs 2> /dev/null`    if test "$static" = "yes" ; then
       sdl_libs=`$sdlconfig --static-libs 2>/dev/null`
     else
       sdl_libs=`$sdlconfig --libs 2> /dev/null`
     fi
   if compile_prog "$sdl_cflags" "$sdl_libs" ; then    if compile_prog "$sdl_cflags" "$sdl_libs" ; then
     _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      else
Line 1000  EOF Line 1185  EOF
       fi        fi
     fi      fi
   
     # static link with sdl ?      # static link with sdl ? (note: sdl.pc's --static --libs is broken)
     if test "$sdl" = "yes" -a "$static" = "yes" ; then      if test "$sdl" = "yes" -a "$static" = "yes" ; then
       sdl_libs=`sdl-config --static-libs 2>/dev/null`        if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then
       if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then           sdl_libs="$sdl_libs `aalib-config --static-libs 2>/dev/null`"
          sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"           sdl_cflags="$sdl_cflags `aalib-config --cflags 2>/dev/null`"
          sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"  
       fi        fi
       if compile_prog "$sdl_cflags" "$sdl_libs" ; then        if compile_prog "$sdl_cflags" "$sdl_libs" ; then
         :          :
Line 1047  if test "$vnc_tls" != "no" ; then Line 1231  if test "$vnc_tls" != "no" ; then
 #include <gnutls/gnutls.h>  #include <gnutls/gnutls.h>
 int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }  int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; }
 EOF  EOF
   vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`    vnc_tls_cflags=`$pkgconfig --cflags gnutls 2> /dev/null`
   vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`    vnc_tls_libs=`$pkgconfig --libs gnutls 2> /dev/null`
   if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then    if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then
     vnc_tls=yes      vnc_tls=yes
     libs_softmmu="$vnc_tls_libs $libs_softmmu"      libs_softmmu="$vnc_tls_libs $libs_softmmu"
Line 1083  EOF Line 1267  EOF
 fi  fi
   
 ##########################################  ##########################################
   # VNC JPEG detection
   if test "$vnc_jpeg" != "no" ; then
   cat > $TMPC <<EOF
   #include <stdio.h>
   #include <jpeglib.h>
   int main(void) { struct jpeg_compress_struct s; jpeg_create_compress(&s); return 0; }
   EOF
       vnc_jpeg_cflags=""
       vnc_jpeg_libs="-ljpeg"
     if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then
       vnc_jpeg=yes
       libs_softmmu="$vnc_jpeg_libs $libs_softmmu"
     else
       if test "$vnc_jpeg" = "yes" ; then
         feature_not_found "vnc-jpeg"
       fi
       vnc_jpeg=no
     fi
   fi
   
   ##########################################
   # VNC PNG detection
   if test "$vnc_png" != "no" ; then
   cat > $TMPC <<EOF
   //#include <stdio.h>
   #include <png.h>
   int main(void) {
       png_structp png_ptr;
       png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
       return 0;
   }
   EOF
       vnc_png_cflags=""
       vnc_png_libs="-lpng"
     if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
       vnc_png=yes
       libs_softmmu="$vnc_png_libs $libs_softmmu"
     else
       if test "$vnc_png" = "yes" ; then
         feature_not_found "vnc-png"
       fi
       vnc_png=no
     fi
   fi
   
   ##########################################
 # fnmatch() probe, used for ACL routines  # fnmatch() probe, used for ACL routines
 fnmatch="no"  fnmatch="no"
 cat > $TMPC << EOF  cat > $TMPC << EOF
Line 1293  fi Line 1523  fi
 ##########################################  ##########################################
 # curl probe  # curl probe
   
   if $pkgconfig libcurl --modversion >/dev/null 2>&1; then
     curlconfig="$pkgconfig libcurl"
   else
     curlconfig=curl-config
   fi
   
 if test "$curl" != "no" ; then  if test "$curl" != "no" ; then
   cat > $TMPC << EOF    cat > $TMPC << EOF
 #include <curl/curl.h>  #include <curl/curl.h>
 int main(void) { return curl_easy_init(); }  int main(void) { return curl_easy_init(); }
 EOF  EOF
   curl_cflags=`curl-config --cflags 2>/dev/null`    curl_cflags=`$curlconfig --cflags 2>/dev/null`
   curl_libs=`curl-config --libs 2>/dev/null`    curl_libs=`$curlconfig --libs 2>/dev/null`
   if compile_prog "$curl_cflags" "$curl_libs" ; then    if compile_prog "$curl_cflags" "$curl_libs" ; then
     curl=yes      curl=yes
     libs_tools="$curl_libs $libs_tools"      libs_tools="$curl_libs $libs_tools"
Line 1320  if test "$check_utests" != "no" ; then Line 1556  if test "$check_utests" != "no" ; then
 #include <check.h>  #include <check.h>
 int main(void) { suite_create("qemu test"); return 0; }  int main(void) { suite_create("qemu test"); return 0; }
 EOF  EOF
   check_libs=`pkg-config --libs check`    check_libs=`$pkgconfig --libs check`
   if compile_prog "" $check_libs ; then    if compile_prog "" $check_libs ; then
     check_utests=yes      check_utests=yes
     libs_tools="$check_libs $libs_tools"      libs_tools="$check_libs $libs_tools"
Line 1339  if test "$bluez" != "no" ; then Line 1575  if test "$bluez" != "no" ; then
 #include <bluetooth/bluetooth.h>  #include <bluetooth/bluetooth.h>
 int main(void) { return bt_error(0); }  int main(void) { return bt_error(0); }
 EOF  EOF
   bluez_cflags=`pkg-config --cflags bluez 2> /dev/null`    bluez_cflags=`$pkgconfig --cflags bluez 2> /dev/null`
   bluez_libs=`pkg-config --libs bluez 2> /dev/null`    bluez_libs=`$pkgconfig --libs bluez 2> /dev/null`
   if compile_prog "$bluez_cflags" "$bluez_libs" ; then    if compile_prog "$bluez_cflags" "$bluez_libs" ; then
     bluez=yes      bluez=yes
     libs_softmmu="$bluez_libs $libs_softmmu"      libs_softmmu="$bluez_libs $libs_softmmu"
Line 1384  EOF Line 1620  EOF
             kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"              kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
       fi        fi
   else    else
       kvm_cflags=""      kvm_cflags=`$pkgconfig --cflags kvm-kmod 2>/dev/null`
   fi    fi
   if compile_prog "$kvm_cflags" "" ; then    if compile_prog "$kvm_cflags" "" ; then
     kvm=yes      kvm=yes
       cat > $TMPC <<EOF
   #include <linux/kvm_para.h>
   int main(void) { return 0; }
   EOF
       if compile_prog "$kvm_cflags" "" ; then
         kvm_para=yes
       fi
   else    else
     if test "$kvm" = "yes" ; then      if test "$kvm" = "yes" ; then
       if [ -x "`which awk 2>/dev/null`" ] && \        if has awk && has grep; then
          [ -x "`which grep 2>/dev/null`" ]; then  
         kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \          kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
         | grep "error: " \          | grep "error: " \
         | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`          | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
Line 1408  EOF Line 1650  EOF
 fi  fi
   
 ##########################################  ##########################################
   # test for vhost net
   
   if test "$vhost_net" != "no"; then
       if test "$kvm" != "no"; then
               cat > $TMPC <<EOF
       #include <linux/vhost.h>
       int main(void) { return 0; }
   EOF
               if compile_prog "$kvm_cflags" "" ; then
                   vhost_net=yes
               else
                   if test "$vhost_net" = "yes" ; then
                       feature_not_found "vhost-net"
                   fi
                   vhost_net=no
               fi
       else
               if test "$vhost_net" = "yes" ; then
                   echo "NOTE: vhost-net feature requires KVM (--enable-kvm)."
                   feature_not_found "vhost-net"
               fi
               vhost_net=no
       fi
   fi
   
   ##########################################
 # pthread probe  # pthread probe
 PTHREADLIBS_LIST="-lpthread -lpthreadGC2"  PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
   
Line 1443  int main(void) { io_setup(0, NULL); io_s Line 1711  int main(void) { io_setup(0, NULL); io_s
 EOF  EOF
   if compile_prog "" "-laio" ; then    if compile_prog "" "-laio" ; then
     linux_aio=yes      linux_aio=yes
     LIBS="$LIBS -laio"      libs_softmmu="$libs_softmmu -laio"
       libs_tools="$libs_tools -laio"
   else    else
     if test "$linux_aio" = "yes" ; then      if test "$linux_aio" = "yes" ; then
       feature_not_found "linux AIO"        feature_not_found "linux AIO"
Line 1453  EOF Line 1722  EOF
 fi  fi
   
 ##########################################  ##########################################
   # attr probe
   
   if test "$attr" != "no" ; then
     cat > $TMPC <<EOF
   #include <stdio.h>
   #include <sys/types.h>
   #include <attr/xattr.h>
   int main(void) { getxattr(NULL, NULL, NULL, 0); setxattr(NULL, NULL, NULL, 0, 0); return 0; }
   EOF
     if compile_prog "" "-lattr" ; then
       attr=yes
       LIBS="-lattr $LIBS"
     else
       if test "$attr" = "yes" ; then
         feature_not_found "ATTR"
       fi
       attr=no
     fi
   fi
   
   ##########################################
 # iovec probe  # iovec probe
 cat > $TMPC <<EOF  cat > $TMPC <<EOF
 #include <sys/types.h>  #include <sys/types.h>
Line 1539  if compile_prog "" "" ; then Line 1829  if compile_prog "" "" ; then
   inotify=yes    inotify=yes
 fi  fi
   
   inotify1=no
   cat > $TMPC << EOF
   #include <sys/inotify.h>
   
   int
   main(void)
   {
       /* try to start inotify */
       return inotify_init1(0);
   }
   EOF
   if compile_prog "" "" ; then
     inotify1=yes
   fi
   
 # check if utimensat and futimens are supported  # check if utimensat and futimens are supported
 utimens=no  utimens=no
 cat > $TMPC << EOF  cat > $TMPC << EOF
Line 1660  fi Line 1965  fi
   
 # Check if tools are available to build documentation.  # Check if tools are available to build documentation.
 if test "$docs" != "no" ; then  if test "$docs" != "no" ; then
   if test -x "`which texi2html 2>/dev/null`" -a \    if has makeinfo && has pod2man; then
           -x "`which pod2man 2>/dev/null`" ; then  
     docs=yes      docs=yes
   else    else
     if test "$docs" = "yes" ; then      if test "$docs" = "yes" ; then
Line 1707  elif compile_prog "" "-lrt" ; then Line 2011  elif compile_prog "" "-lrt" ; then
   LIBS="-lrt $LIBS"    LIBS="-lrt $LIBS"
 fi  fi
   
 # Determine what linker flags to use to force archive inclusion  
 check_linker_flags()  
 {  
     w2=  
     if test "$2" ; then  
         w2=-Wl,$2  
     fi  
     compile_prog "" "-Wl,$1 ${w2}"  
 }  
   
 cat > $TMPC << EOF  
 int main(void) { }  
 EOF  
 if check_linker_flags --whole-archive --no-whole-archive ; then  
     # GNU ld  
     arlibs_begin="-Wl,--whole-archive"  
     arlibs_end="-Wl,--no-whole-archive"  
 elif check_linker_flags -z,allextract -z,defaultextract ; then  
     # Solaris ld  
     arlibs_begin="-Wl,-z,allextract"  
     arlibs_end="-Wl,-z,defaultextract"  
 elif check_linker_flags -all_load ; then  
     # Mac OS X  
     arlibs_begin="-all_load"  
     arlibs_end=""  
 else  
     echo "Error: your linker does not support --whole-archive or -z."  
     echo "Please report to qemu-devel@nongnu.org"  
     exit 1  
 fi  
   
 if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \  if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
         "$aix" != "yes" ; then          "$aix" != "yes" ; then
     libs_softmmu="-lutil $libs_softmmu"      libs_softmmu="-lutil $libs_softmmu"
Line 1824  if test "$solaris" = "no" ; then Line 2097  if test "$solaris" = "no" ; then
     fi      fi
 fi  fi
   
 if test "$mingw32" = "yes" ; then  confdir=$sysconfdir$confsuffix
   if test -z "$prefix" ; then  
       prefix="c:/Program Files/Qemu"  tools=
   fi  if test "$softmmu" = yes ; then
   mansuffix=""    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
   datasuffix=""    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
   docsuffix=""        tools="qemu-nbd\$(EXESUF) $tools"
   binsuffix=""      if [ "$check_utests" = "yes" ]; then
 else        tools="check-qint check-qstring check-qdict check-qlist $tools"
   if test -z "$prefix" ; then        tools="check-qfloat check-qjson $tools"
       prefix="/usr/local"      fi
   fi    fi
   mansuffix="/share/man"  
   datasuffix="/share/qemu"  
   docsuffix="/share/doc/qemu"  
   binsuffix="/bin"  
 fi  fi
   
   # Mac OS X ships with a broken assembler
   roms=
   if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
           "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
           "$softmmu" = yes ; then
     roms="optionrom"
   fi
   
   
 echo "Install prefix    $prefix"  echo "Install prefix    $prefix"
 echo "BIOS directory    $prefix$datasuffix"  echo "BIOS directory    `eval echo $datadir`"
 echo "binary directory  $prefix$binsuffix"  echo "binary directory  `eval echo $bindir`"
   echo "config directory  `eval echo $sysconfdir`"
 if test "$mingw32" = "no" ; then  if test "$mingw32" = "no" ; then
 echo "Manual directory  $prefix$mansuffix"  echo "Manual directory  `eval echo $mandir`"
 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 1861  echo "host CPU          $cpu" Line 2140  echo "host CPU          $cpu"
 echo "host big endian   $bigendian"  echo "host big endian   $bigendian"
 echo "target list       $target_list"  echo "target list       $target_list"
 echo "tcg debug enabled $debug_tcg"  echo "tcg debug enabled $debug_tcg"
   echo "Mon debug enabled $debug_mon"
 echo "gprof enabled     $gprof"  echo "gprof enabled     $gprof"
 echo "sparse enabled    $sparse"  echo "sparse enabled    $sparse"
 echo "strip binaries    $strip_opt"  echo "strip binaries    $strip_opt"
Line 1881  echo "Block whitelist   $block_drv_white Line 2161  echo "Block whitelist   $block_drv_white
 echo "Mixer emulation   $mixemu"  echo "Mixer emulation   $mixemu"
 echo "VNC TLS support   $vnc_tls"  echo "VNC TLS support   $vnc_tls"
 echo "VNC SASL support  $vnc_sasl"  echo "VNC SASL support  $vnc_sasl"
   echo "VNC JPEG support  $vnc_jpeg"
   echo "VNC PNG support   $vnc_png"
   echo "VNC thread        $vnc_thread"
 if test -n "$sparc_cpu"; then  if test -n "$sparc_cpu"; then
     echo "Target Sparc Arch $sparc_cpu"      echo "Target Sparc Arch $sparc_cpu"
 fi  fi
Line 1896  echo "PIE user targets  $user_pie" Line 2179  echo "PIE user targets  $user_pie"
 echo "vde support       $vde"  echo "vde support       $vde"
 echo "IO thread         $io_thread"  echo "IO thread         $io_thread"
 echo "Linux AIO support $linux_aio"  echo "Linux AIO support $linux_aio"
   echo "ATTR/XATTR support $attr"
 echo "Install blobs     $blobs"  echo "Install blobs     $blobs"
 echo "KVM support       $kvm"  echo "KVM support       $kvm"
 echo "fdt support       $fdt"  echo "fdt support       $fdt"
 echo "preadv support    $preadv"  echo "preadv support    $preadv"
 echo "fdatasync         $fdatasync"  echo "fdatasync         $fdatasync"
 echo "uuid support      $uuid"  echo "uuid support      $uuid"
   echo "vhost-net support $vhost_net"
   
 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 1915  printf "# Configured with:" >> $config_h Line 2200  printf "# Configured with:" >> $config_h
 printf " '%s'" "$0" "$@" >> $config_host_mak  printf " '%s'" "$0" "$@" >> $config_host_mak
 echo >> $config_host_mak  echo >> $config_host_mak
   
 echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak  echo "prefix=$prefix" >> $config_host_mak
   echo "bindir=$bindir" >> $config_host_mak
   echo "mandir=$mandir" >> $config_host_mak
   echo "datadir=$datadir" >> $config_host_mak
   echo "sysconfdir=$sysconfdir" >> $config_host_mak
   echo "docdir=$docdir" >> $config_host_mak
   echo "confdir=$confdir" >> $config_host_mak
   
 case "$cpu" in  case "$cpu" in
   i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)    i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)
Line 1924  case "$cpu" in Line 2215  case "$cpu" in
   armv4b|armv4l)    armv4b|armv4l)
     ARCH=arm      ARCH=arm
   ;;    ;;
   *)  
     echo "Unsupported CPU = $cpu"  
     exit 1  
   ;;  
 esac  esac
 echo "ARCH=$ARCH" >> $config_host_mak  echo "ARCH=$ARCH" >> $config_host_mak
 if test "$debug_tcg" = "yes" ; then  if test "$debug_tcg" = "yes" ; then
   echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak    echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
 fi  fi
   if test "$debug_mon" = "yes" ; then
     echo "CONFIG_DEBUG_MONITOR=y" >> $config_host_mak
   fi
 if test "$debug" = "yes" ; then  if test "$debug" = "yes" ; then
   echo "CONFIG_DEBUG_EXEC=y" >> $config_host_mak    echo "CONFIG_DEBUG_EXEC=y" >> $config_host_mak
 fi  fi
Line 1970  if test "$solaris" = "yes" ; then Line 2260  if test "$solaris" = "yes" ; then
 fi  fi
 if test "$static" = "yes" ; then  if test "$static" = "yes" ; then
   echo "CONFIG_STATIC=y" >> $config_host_mak    echo "CONFIG_STATIC=y" >> $config_host_mak
   LDFLAGS="-static $LDFLAGS"  
 fi  fi
 if test $profiler = "yes" ; then  if test $profiler = "yes" ; then
   echo "CONFIG_PROFILER=y" >> $config_host_mak    echo "CONFIG_PROFILER=y" >> $config_host_mak
Line 2012  if test "$vnc_sasl" = "yes" ; then Line 2301  if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak    echo "CONFIG_VNC_SASL=y" >> $config_host_mak
   echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak    echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
 fi  fi
   if test "$vnc_jpeg" != "no" ; then
     echo "CONFIG_VNC_JPEG=y" >> $config_host_mak
     echo "VNC_JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak
   fi
   if test "$vnc_png" != "no" ; then
     echo "CONFIG_VNC_PNG=y" >> $config_host_mak
     echo "VNC_PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak
   fi
   if test "$vnc_thread" != "no" ; then
     echo "CONFIG_VNC_THREAD=y" >> $config_host_mak
     echo "CONFIG_THREAD=y" >> $config_host_mak
   fi
 if test "$fnmatch" = "yes" ; then  if test "$fnmatch" = "yes" ; then
   echo "CONFIG_FNMATCH=y" >> $config_host_mak    echo "CONFIG_FNMATCH=y" >> $config_host_mak
 fi  fi
Line 2022  qemu_version=`head $source_path/VERSION` Line 2323  qemu_version=`head $source_path/VERSION`
 echo "VERSION=$qemu_version" >>$config_host_mak  echo "VERSION=$qemu_version" >>$config_host_mak
 echo "PKGVERSION=$pkgversion" >>$config_host_mak  echo "PKGVERSION=$pkgversion" >>$config_host_mak
 echo "SRC_PATH=$source_path" >> $config_host_mak  echo "SRC_PATH=$source_path" >> $config_host_mak
 if [ "$source_path_used" = "yes" ]; then  
   echo "VPATH=$source_path" >> $config_host_mak  
 fi  
 echo "TARGET_DIRS=$target_list" >> $config_host_mak  echo "TARGET_DIRS=$target_list" >> $config_host_mak
 if [ "$docs" = "yes" ] ; then  if [ "$docs" = "yes" ] ; then
   echo "BUILD_DOCS=yes" >> $config_host_mak    echo "BUILD_DOCS=yes" >> $config_host_mak
Line 2066  fi Line 2364  fi
 if test "$inotify" = "yes" ; then  if test "$inotify" = "yes" ; then
   echo "CONFIG_INOTIFY=y" >> $config_host_mak    echo "CONFIG_INOTIFY=y" >> $config_host_mak
 fi  fi
   if test "$inotify1" = "yes" ; then
     echo "CONFIG_INOTIFY1=y" >> $config_host_mak
   fi
 if test "$byteswap_h" = "yes" ; then  if test "$byteswap_h" = "yes" ; then
   echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak    echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
 fi  fi
Line 2088  if test "$xen" = "yes" ; then Line 2389  if test "$xen" = "yes" ; then
 fi  fi
 if test "$io_thread" = "yes" ; then  if test "$io_thread" = "yes" ; then
   echo "CONFIG_IOTHREAD=y" >> $config_host_mak    echo "CONFIG_IOTHREAD=y" >> $config_host_mak
     echo "CONFIG_THREAD=y" >> $config_host_mak
 fi  fi
 if test "$linux_aio" = "yes" ; then  if test "$linux_aio" = "yes" ; then
   echo "CONFIG_LINUX_AIO=y" >> $config_host_mak    echo "CONFIG_LINUX_AIO=y" >> $config_host_mak
 fi  fi
   if test "$attr" = "yes" ; then
     echo "CONFIG_ATTR=y" >> $config_host_mak
   fi
   if test "$linux" = "yes" ; then
     if test "$attr" = "yes" ; then
       echo "CONFIG_VIRTFS=y" >> $config_host_mak
     fi
   fi
 if test "$blobs" = "yes" ; then  if test "$blobs" = "yes" ; then
   echo "INSTALL_BLOBS=yes" >> $config_host_mak    echo "INSTALL_BLOBS=yes" >> $config_host_mak
 fi  fi
Line 2138  bsd) Line 2448  bsd)
 ;;  ;;
 esac  esac
   
 tools=  
 if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then  
   tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"  
   if [ "$linux" = "yes" ] ; then  
       tools="qemu-nbd\$(EXESUF) $tools"  
     if [ "$check_utests" = "yes" ]; then  
       tools="check-qint check-qstring check-qdict check-qlist $tools"  
       tools="check-qfloat check-qjson $tools"  
     fi  
   fi  
 fi  
 echo "TOOLS=$tools" >> $config_host_mak  echo "TOOLS=$tools" >> $config_host_mak
   
 # Mac OS X ships with a broken assembler  
 roms=  
 if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \  
         "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \  
         `expr "$target_list" : ".*softmmu.*"` != 0 ; then  
   roms="optionrom"  
 fi  
 echo "ROMS=$roms" >> $config_host_mak  echo "ROMS=$roms" >> $config_host_mak
   
 echo "prefix=$prefix" >> $config_host_mak  
 echo "bindir=\${prefix}$binsuffix" >> $config_host_mak  
 echo "mandir=\${prefix}$mansuffix" >> $config_host_mak  
 echo "datadir=\${prefix}$datasuffix" >> $config_host_mak  
 echo "docdir=\${prefix}$docsuffix" >> $config_host_mak  
 echo "MAKE=$make" >> $config_host_mak  echo "MAKE=$make" >> $config_host_mak
 echo "INSTALL=$install" >> $config_host_mak  echo "INSTALL=$install" >> $config_host_mak
 echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak  echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
Line 2202  if test -f ${config_host_ld}~ ; then Line 2487  if test -f ${config_host_ld}~ ; then
   fi    fi
 fi  fi
   
   for d in libdis libdis-user; do
       mkdir -p $d
       rm -f $d/Makefile
       ln -s $source_path/Makefile.dis $d/Makefile
       echo > $d/config.mak
   done
   if test "$static" = "no" -a "$user_pie" = "yes" ; then
     echo "QEMU_CFLAGS+=-fpie" > libdis-user/config.mak
   fi
   
 for target in $target_list; do  for target in $target_list; do
 target_dir="$target"  target_dir="$target"
 config_target_mak=$target_dir/config-target.mak  config_target_mak=$target_dir/config-target.mak
Line 2270  ln -s $source_path/Makefile.target $targ Line 2565  ln -s $source_path/Makefile.target $targ
 echo "# Automatically generated by configure - do not modify" > $config_target_mak  echo "# Automatically generated by configure - do not modify" > $config_target_mak
   
 bflt="no"  bflt="no"
 elfload32="no"  
 target_nptl="no"  target_nptl="no"
 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`  interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
 echo "CONFIG_QEMU_PREFIX=\"$interp_prefix1\"" >> $config_target_mak  echo "CONFIG_QEMU_INTERP_PREFIX=\"$interp_prefix1\"" >> $config_target_mak
 gdb_xml_files=""  gdb_xml_files=""
   
 TARGET_ARCH="$target_arch2"  TARGET_ARCH="$target_arch2"
Line 2290  case "$target_arch2" in Line 2584  case "$target_arch2" in
   ;;    ;;
   alpha)    alpha)
     target_phys_bits=64      target_phys_bits=64
       target_nptl="yes"
   ;;    ;;
   arm|armeb)    arm|armeb)
     TARGET_ARCH=arm      TARGET_ARCH=arm
Line 2367  case "$target_arch2" in Line 2662  case "$target_arch2" in
   ;;    ;;
   sparc64)    sparc64)
     TARGET_BASE_ARCH=sparc      TARGET_BASE_ARCH=sparc
     elfload32="yes"  
     target_phys_bits=64      target_phys_bits=64
   ;;    ;;
   sparc32plus)    sparc32plus)
Line 2398  if [ "$TARGET_ABI_DIR" = "" ]; then Line 2692  if [ "$TARGET_ABI_DIR" = "" ]; then
   TARGET_ABI_DIR=$TARGET_ARCH    TARGET_ABI_DIR=$TARGET_ARCH
 fi  fi
 echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak  echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_target_mak
 if [ $target_phys_bits -lt $hostlongbits ] ; then  
   target_phys_bits=$hostlongbits  
 fi  
 case "$target_arch2" in  case "$target_arch2" in
   i386|x86_64)    i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then      if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
Line 2418  case "$target_arch2" in Line 2709  case "$target_arch2" in
       \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then        \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak        echo "CONFIG_KVM=y" >> $config_target_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_target_mak        echo "KVM_CFLAGS=$kvm_cflags" >> $config_target_mak
         if test "$kvm_para" = "yes"; then
           echo "CONFIG_KVM_PARA=y" >> $config_target_mak
         fi
         if test $vhost_net = "yes" ; then
           echo "CONFIG_VHOST_NET=y" >> $config_target_mak
         fi
     fi      fi
 esac  esac
 echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak  
 if test "$target_bigendian" = "yes" ; then  if test "$target_bigendian" = "yes" ; then
   echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak    echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
 fi  fi
 if test "$target_softmmu" = "yes" ; then  if test "$target_softmmu" = "yes" ; then
     echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak
   echo "CONFIG_SOFTMMU=y" >> $config_target_mak    echo "CONFIG_SOFTMMU=y" >> $config_target_mak
   echo "LIBS+=$libs_softmmu" >> $config_target_mak    echo "LIBS+=$libs_softmmu" >> $config_target_mak
   echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_target_mak    echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
   echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak    echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
 fi  fi
 if test "$target_user_only" = "yes" ; then  if test "$target_user_only" = "yes" ; then
Line 2448  if test ! -z "$gdb_xml_files" ; then Line 2745  if test ! -z "$gdb_xml_files" ; then
 fi  fi
   
 case "$target_arch2" in  case "$target_arch2" in
   arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|s390x|sparc|sparc64|sparc32plus)    alpha|arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|s390x|sparc|sparc64|sparc32plus)
     echo "CONFIG_SOFTFLOAT=y" >> $config_target_mak      echo "CONFIG_SOFTFLOAT=y" >> $config_target_mak
     ;;      ;;
   *)    *)
Line 2463  if test "$target_user_only" = "yes" \ Line 2760  if test "$target_user_only" = "yes" \
         -a "$nptl" = "yes" -a "$target_nptl" = "yes"; then          -a "$nptl" = "yes" -a "$target_nptl" = "yes"; then
   echo "CONFIG_USE_NPTL=y" >> $config_target_mak    echo "CONFIG_USE_NPTL=y" >> $config_target_mak
 fi  fi
 # 32 bit ELF loader in addition to native 64 bit loader?  
 if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then  
   echo "TARGET_HAS_ELFLOAD32=y" >> $config_target_mak  
 fi  
 if test "$target_user_only" = "yes" -a "$guest_base" = "yes"; then  if test "$target_user_only" = "yes" -a "$guest_base" = "yes"; then
   echo "CONFIG_USE_GUEST_BASE=y" >> $config_target_mak    echo "CONFIG_USE_GUEST_BASE=y" >> $config_target_mak
 fi  fi
Line 2483  if test "$ARCH" = "sparc64" ; then Line 2776  if test "$ARCH" = "sparc64" ; then
   cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"    cflags="-I\$(SRC_PATH)/tcg/sparc $cflags"
 elif test "$ARCH" = "s390x" ; then  elif test "$ARCH" = "s390x" ; then
   cflags="-I\$(SRC_PATH)/tcg/s390 $cflags"    cflags="-I\$(SRC_PATH)/tcg/s390 $cflags"
   elif test "$ARCH" = "x86_64" ; then
     cflags="-I\$(SRC_PATH)/tcg/i386 $cflags"
 else  else
   cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"    cflags="-I\$(SRC_PATH)/tcg/\$(ARCH) $cflags"
 fi  fi
 cflags="-I\$(SRC_PATH)/tcg $cflags"  cflags="-I\$(SRC_PATH)/tcg $cflags"
 cflags="-I\$(SRC_PATH)/fpu $cflags"  cflags="-I\$(SRC_PATH)/fpu $cflags"
   
   if test "$target_user_only" = "yes" ; then
       libdis_config_mak=libdis-user/config.mak
   else
       libdis_config_mak=libdis/config.mak
   fi
   
 for i in $ARCH $TARGET_BASE_ARCH ; do  for i in $ARCH $TARGET_BASE_ARCH ; do
   case "$i" in    case "$i" in
   alpha)    alpha)
     echo "CONFIG_ALPHA_DIS=y"  >> $config_target_mak      echo "CONFIG_ALPHA_DIS=y"  >> $config_target_mak
       echo "CONFIG_ALPHA_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   arm)    arm)
     echo "CONFIG_ARM_DIS=y"  >> $config_target_mak      echo "CONFIG_ARM_DIS=y"  >> $config_target_mak
       echo "CONFIG_ARM_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   cris)    cris)
     echo "CONFIG_CRIS_DIS=y"  >> $config_target_mak      echo "CONFIG_CRIS_DIS=y"  >> $config_target_mak
       echo "CONFIG_CRIS_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   hppa)    hppa)
     echo "CONFIG_HPPA_DIS=y"  >> $config_target_mak      echo "CONFIG_HPPA_DIS=y"  >> $config_target_mak
       echo "CONFIG_HPPA_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   i386|x86_64)    i386|x86_64)
     echo "CONFIG_I386_DIS=y"  >> $config_target_mak      echo "CONFIG_I386_DIS=y"  >> $config_target_mak
       echo "CONFIG_I386_DIS=y"  >> $libdis_config_mak
     ;;
     ia64*)
       echo "CONFIG_IA64_DIS=y"  >> $config_target_mak
       echo "CONFIG_IA64_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   m68k)    m68k)
     echo "CONFIG_M68K_DIS=y"  >> $config_target_mak      echo "CONFIG_M68K_DIS=y"  >> $config_target_mak
       echo "CONFIG_M68K_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   microblaze)    microblaze)
     echo "CONFIG_MICROBLAZE_DIS=y"  >> $config_target_mak      echo "CONFIG_MICROBLAZE_DIS=y"  >> $config_target_mak
       echo "CONFIG_MICROBLAZE_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   mips*)    mips*)
     echo "CONFIG_MIPS_DIS=y"  >> $config_target_mak      echo "CONFIG_MIPS_DIS=y"  >> $config_target_mak
       echo "CONFIG_MIPS_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   ppc*)    ppc*)
     echo "CONFIG_PPC_DIS=y"  >> $config_target_mak      echo "CONFIG_PPC_DIS=y"  >> $config_target_mak
       echo "CONFIG_PPC_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   s390*)    s390*)
     echo "CONFIG_S390_DIS=y"  >> $config_target_mak      echo "CONFIG_S390_DIS=y"  >> $config_target_mak
       echo "CONFIG_S390_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   sh4)    sh4)
     echo "CONFIG_SH4_DIS=y"  >> $config_target_mak      echo "CONFIG_SH4_DIS=y"  >> $config_target_mak
       echo "CONFIG_SH4_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   sparc*)    sparc*)
     echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak      echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak
       echo "CONFIG_SPARC_DIS=y"  >> $libdis_config_mak
   ;;    ;;
   esac    esac
 done  done
Line 2535  alpha) Line 2852  alpha)
   # Ensure there's only a single GP    # Ensure there's only a single GP
   cflags="-msmall-data $cflags"    cflags="-msmall-data $cflags"
 ;;  ;;
 ia64)  
   cflags="-mno-sdata $cflags"  
 ;;  
 esac  esac
   
 if test "$target_softmmu" = "yes" ; then  if test "$target_softmmu" = "yes" ; then
Line 2582  if test "$target_linux_user" = "yes" -o  Line 2896  if test "$target_linux_user" = "yes" -o 
     # -static is used to avoid g1/g3 usage by the dynamic linker      # -static is used to avoid g1/g3 usage by the dynamic linker
     ldflags="$linker_script -static $ldflags"      ldflags="$linker_script -static $ldflags"
     ;;      ;;
   ia64)    alpha | s390x)
     ldflags="-Wl,-G0 $linker_script -static $ldflags"      # The default placement of the application is fine.
     ;;      ;;
   i386|x86_64|ppc|ppc64|s390|sparc64|alpha|arm|m68k|mips|mips64)    *)
     ldflags="$linker_script $ldflags"      ldflags="$linker_script $ldflags"
     ;;      ;;
   esac    esac
 fi  fi
 if test "$target_softmmu" = "yes" ; then  
   case "$ARCH" in  
   ia64)  
     ldflags="-Wl,-G0 $linker_script -static $ldflags"  
     ;;  
   esac  
 fi  
   
 echo "LDFLAGS+=$ldflags" >> $config_target_mak  echo "LDFLAGS+=$ldflags" >> $config_target_mak
 echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak  echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
Line 2607  done # for target in $targets Line 2914  done # for target in $targets
 if test "$source_path_used" = "yes" ; then  if test "$source_path_used" = "yes" ; then
     DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"      DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
     DIRS="$DIRS roms/seabios roms/vgabios"      DIRS="$DIRS roms/seabios roms/vgabios"
       DIRS="$DIRS fsdev ui"
     FILES="Makefile tests/Makefile"      FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"      FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
     FILES="$FILES tests/test-mmap.c"      FILES="$FILES tests/test-mmap.c"
Line 2628  fi Line 2936  fi
 # temporary config to build submodules  # temporary config to build submodules
 for rom in seabios vgabios ; do  for rom in seabios vgabios ; do
     config_mak=roms/$rom/config.mak      config_mak=roms/$rom/config.mak
     echo "# Automatically generated by configure - do not modify" >> $config_mak      echo "# Automatically generated by configure - do not modify" > $config_mak
     echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak      echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak
     echo "CC=$cc" >> $config_mak      echo "CC=$cc" >> $config_mak
     echo "BCC=bcc" >> $config_mak      echo "BCC=bcc" >> $config_mak
Line 2642  done Line 2950  done
 for hwlib in 32 64; do  for hwlib in 32 64; do
   d=libhw$hwlib    d=libhw$hwlib
   mkdir -p $d    mkdir -p $d
     mkdir -p $d/ide
   rm -f $d/Makefile    rm -f $d/Makefile
   ln -s $source_path/Makefile.hw $d/Makefile    ln -s $source_path/Makefile.hw $d/Makefile
   echo "HWLIB=libqemuhw$hwlib.a" > $d/config.mak    echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak
   echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" >> $d/config.mak  
 done  done
   
 d=libuser  d=libuser
 mkdir -p $d  mkdir -p $d
 rm -f $d/Makefile  rm -f $d/Makefile
 ln -s $source_path/Makefile.user $d/Makefile  ln -s $source_path/Makefile.user $d/Makefile
   if test "$static" = "no" -a "$user_pie" = "yes" ; then
     echo "QEMU_CFLAGS+=-fpie" > $d/config.mak
   fi
   
   if test "$docs" = "yes" ; then
     mkdir -p QMP
   fi

Removed from v.1.1.1.11  
changed lines
  Added in v.1.1.1.13


unix.superglobalmegacorp.com