block/sheepdog: Fix silent sd_open(), sd_create() failures

[qemu.git] / configure

diff --git a/configure b/configure
index 2fbec59e96ccc46d46c1f29162a621ea5effcb02..0e516f9e2aa136b1b8fe18fe5cc30ed59c533c95 100755 (executable)
--- a/configure
+++ b/configure
@@ -2,26 +2,28 @@
 #
 # qemu configure script (c) 2003 Fabrice Bellard
 #
 #
 # qemu configure script (c) 2003 Fabrice Bellard
 #

-# set temporary file name
-if test ! -z "$TMPDIR" ; then
-    TMPDIR1="${TMPDIR}"
-elif test ! -z "$TEMPDIR" ; then
-    TMPDIR1="${TEMPDIR}"
-else
-    TMPDIR1="/tmp"
+
+# Temporary directory used for files created while
+# configure runs. Since it is in the build directory
+# we can safely blow away any previous version of it
+# (and we need not jump through hoops to try to delete
+# it when configure exits.)
+TMPDIR1="config-temp"
+rm -rf "${TMPDIR1}"
+mkdir -p "${TMPDIR1}"
+if [ $? -ne 0 ]; then
+    echo "ERROR: failed to create temporary directory"
+    exit 1

 fi
 
 fi
 

-TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.c"
-TMPB="qemu-conf-${RANDOM}-$$-${RANDOM}"
+TMPB="qemu-conf"
+TMPC="${TMPDIR1}/${TMPB}.c"

 TMPO="${TMPDIR1}/${TMPB}.o"
 TMPCXX="${TMPDIR1}/${TMPB}.cxx"
 TMPL="${TMPDIR1}/${TMPB}.lo"
 TMPA="${TMPDIR1}/lib${TMPB}.la"
 TMPO="${TMPDIR1}/${TMPB}.o"
 TMPCXX="${TMPDIR1}/${TMPB}.cxx"
 TMPL="${TMPDIR1}/${TMPB}.lo"
 TMPA="${TMPDIR1}/lib${TMPB}.la"

-TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe"
+TMPE="${TMPDIR1}/${TMPB}.exe"

 
 

-# NB: do not call "exit" in the trap handler; this is buggy with some shells;
-# see <[email protected]>
-trap "rm -f $TMPC $TMPO $TMPCXX $TMPE" EXIT INT QUIT TERM

 rm -f config.log
 
 # Print a helpful header at the top of config.log
 rm -f config.log
 
 # Print a helpful header at the top of config.log


@@ -285,7 +287,6 @@ softmmu="yes"
 linux_user="no"
 bsd_user="no"
 guest_base="yes"
 linux_user="no"
 bsd_user="no"
 guest_base="yes"

-uname_release=""

 aix="no"
 blobs="yes"
 pkgversion=""
 aix="no"
 blobs="yes"
 pkgversion=""


@@ -318,7 +319,7 @@ glusterfs_discard="no"
 glusterfs_zerofill="no"
 virtio_blk_data_plane=""
 gtk=""
 glusterfs_zerofill="no"
 virtio_blk_data_plane=""
 gtk=""

-gtkabi="2.0"
+gtkabi=""

 vte=""
 tpm="no"
 libssh2=""
 vte=""
 tpm="no"
 libssh2=""


@@ -404,6 +405,14 @@ fi
 # make source path absolute
 source_path=`cd "$source_path"; pwd`
 
 # make source path absolute
 source_path=`cd "$source_path"; pwd`
 

+# running configure in the source tree?
+# we know that's the case if configure is there.
+if test -f "./configure"; then
+    pwd_is_source_path="y"
+else
+    pwd_is_source_path="n"
+fi
+

 check_define() {
 cat > $TMPC <<EOF
 #if !defined($1)
 check_define() {
 cat > $TMPC <<EOF
 #if !defined($1)


@@ -945,8 +954,6 @@ for opt do
   ;;
   --disable-pie) pie="no"
   ;;
   ;;
   --disable-pie) pie="no"
   ;;

-  --enable-uname-release=*) uname_release="$optarg"
-  ;;

   --enable-werror) werror="yes"
   ;;
   --disable-werror) werror="no"
   --enable-werror) werror="yes"
   ;;
   --disable-werror) werror="no"


@@ -1132,11 +1139,11 @@ case "$cpu" in
            CPU_CFLAGS="-m64 -mcpu=ultrasparc"
            ;;
     s390)
            CPU_CFLAGS="-m64 -mcpu=ultrasparc"
            ;;
     s390)

-           CPU_CFLAGS="-m31 -march=z990"
+           CPU_CFLAGS="-m31"

            LDFLAGS="-m31 $LDFLAGS"
            ;;
     s390x)
            LDFLAGS="-m31 $LDFLAGS"
            ;;
     s390x)

-           CPU_CFLAGS="-m64 -march=z990"
+           CPU_CFLAGS="-m64"

            LDFLAGS="-m64 $LDFLAGS"
            ;;
     i386)
            LDFLAGS="-m64 $LDFLAGS"
            ;;
     i386)


@@ -1233,6 +1240,7 @@ Advanced options (experts only):
   --with-sdlabi            select preferred SDL ABI 1.2 or 2.0
   --disable-gtk            disable gtk UI
   --enable-gtk             enable gtk UI
   --with-sdlabi            select preferred SDL ABI 1.2 or 2.0
   --disable-gtk            disable gtk UI
   --enable-gtk             enable gtk UI

+  --with-gtkabi            select preferred GTK ABI 2.0 or 3.0

   --disable-virtfs         disable VirtFS
   --enable-virtfs          enable VirtFS
   --disable-vnc            disable VNC
   --disable-virtfs         disable VirtFS
   --enable-virtfs          enable VirtFS
   --disable-vnc            disable VNC


@@ -1294,7 +1302,6 @@ Advanced options (experts only):
   --fmod-lib               path to FMOD library
   --fmod-inc               path to FMOD includes
   --oss-lib                path to OSS library
   --fmod-lib               path to FMOD library
   --fmod-inc               path to FMOD includes
   --oss-lib                path to OSS library

-  --enable-uname-release=R Return R for uname -r in usermode emulation

   --cpu=CPU                Build for host CPU [$cpu]
   --disable-uuid           disable uuid support
   --enable-uuid            enable uuid support
   --cpu=CPU                Build for host CPU [$cpu]
   --disable-uuid           disable uuid support
   --enable-uuid            enable uuid support


@@ -1965,6 +1972,18 @@ fi
 ##########################################
 # GTK probe
 
 ##########################################
 # GTK probe
 

+if test "$gtkabi" = ""; then
+    # The GTK ABI was not specified explicitly, so try whether 2.0 is available.
+    # Use 3.0 as a fallback if that is available.
+    if $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then
+        gtkabi=2.0
+    elif $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then
+        gtkabi=3.0
+    else
+        gtkabi=2.0
+    fi
+fi
+

 if test "$gtk" != "no"; then
     gtkpackage="gtk+-$gtkabi"
     if test "$gtkabi" = "3.0" ; then
 if test "$gtk" != "no"; then
     gtkpackage="gtk+-$gtkabi"
     if test "$gtkabi" = "3.0" ; then


@@ -1978,7 +1997,7 @@ if test "$gtk" != "no"; then
         libs_softmmu="$gtk_libs $libs_softmmu"
         gtk="yes"
     elif test "$gtk" = "yes"; then
         libs_softmmu="$gtk_libs $libs_softmmu"
         gtk="yes"
     elif test "$gtk" = "yes"; then

-        feature_not_found "gtk" "Install gtk2 or gtk3 (requires --with-gtkabi=3.0 option to configure) devel"
+        feature_not_found "gtk" "Install gtk2 or gtk3 devel"

     else
         gtk="no"
     fi
     else
         gtk="no"
     fi


@@ -2001,7 +2020,11 @@ if test "$vte" != "no"; then
         libs_softmmu="$vte_libs $libs_softmmu"
         vte="yes"
     elif test "$vte" = "yes"; then
         libs_softmmu="$vte_libs $libs_softmmu"
         vte="yes"
     elif test "$vte" = "yes"; then

-        feature_not_found "vte" "Install libvte or libvte-2.90 (requires --with-gtkabi=3.0 option to configure) devel"
+        if test "$gtkabi" = "3.0"; then
+            feature_not_found "vte" "Install libvte-2.90 devel"
+        else
+            feature_not_found "vte" "Install libvte devel"
+        fi

     else
         vte="no"
     fi
     else
         vte="no"
     fi


@@ -2627,7 +2650,7 @@ done
 if test "$modules" = yes; then
     shacmd_probe="sha1sum sha1 shasum"
     for c in $shacmd_probe; do
 if test "$modules" = yes; then
     shacmd_probe="sha1sum sha1 shasum"
     for c in $shacmd_probe; do

-        if which $c &>/dev/null; then
+        if which $c >/dev/null 2>&1; then

             shacmd="$c"
             break
         fi
             shacmd="$c"
             break
         fi


@@ -2943,7 +2966,7 @@ EOF
     fdt=yes
     dtc_internal="yes"
     mkdir -p dtc
     fdt=yes
     dtc_internal="yes"
     mkdir -p dtc

-    if [ "$source_path" != `pwd` ] ; then
+    if [ "$pwd_is_source_path" != "y" ] ; then

        symlink "$source_path/dtc/Makefile" "dtc/Makefile"
        symlink "$source_path/dtc/scripts" "dtc/scripts"
     fi
        symlink "$source_path/dtc/Makefile" "dtc/Makefile"
        symlink "$source_path/dtc/scripts" "dtc/scripts"
     fi


@@ -3465,10 +3488,10 @@ if test "$smartcard_nss" != "no"; then
 #include <pk11pub.h>
 int main(void) { PK11_FreeSlot(0); return 0; }
 EOF
 #include <pk11pub.h>
 int main(void) { PK11_FreeSlot(0); return 0; }
 EOF

-    smartcard_includes="-I\$(SRC_PATH)/libcacard"
-    libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
-    libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
-    test_cflags="$libcacard_cflags"
+    # FIXME: do not include $glib_* in here
+    nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
+    nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
+    test_cflags="$nss_cflags"

     # The header files in nss < 3.13.3 have a bug which causes them to
     # emit a warning. If we're going to compile QEMU with -Werror, then
     # test that the headers don't have this bug. Otherwise we would pass
     # The header files in nss < 3.13.3 have a bug which causes them to
     # emit a warning. If we're going to compile QEMU with -Werror, then
     # test that the headers don't have this bug. Otherwise we would pass


@@ -3478,11 +3501,8 @@ EOF
     fi
     if test -n "$libtool" &&
        $pkg_config --atleast-version=3.12.8 nss && \
     fi
     if test -n "$libtool" &&
        $pkg_config --atleast-version=3.12.8 nss && \

-      compile_prog "$test_cflags" "$libcacard_libs"; then
+      compile_prog "$test_cflags" "$nss_libs"; then

         smartcard_nss="yes"
         smartcard_nss="yes"

-        QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
-        QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
-        libs_softmmu="$libcacard_libs $libs_softmmu"

     else
         if test "$smartcard_nss" = "yes"; then
             feature_not_found "nss"
     else
         if test "$smartcard_nss" = "yes"; then
             feature_not_found "nss"


@@ -4027,11 +4047,14 @@ fi
 if test "$pie" = "no" ; then
   textseg_addr=
   case "$cpu" in
 if test "$pie" = "no" ; then
   textseg_addr=
   case "$cpu" in

-    arm | hppa | i386 | m68k | ppc | ppc64 | s390* | sparc | sparc64 | x86_64 | x32)
+    arm | i386 | ppc* | s390* | sparc* | x86_64 | x32)
+      # ??? Rationale for choosing this address

       textseg_addr=0x60000000
       ;;
     mips)
       textseg_addr=0x60000000
       ;;
     mips)

-      textseg_addr=0x400000
+      # A 256M aligned address, high in the address space, with enough
+      # room for the code_gen_buffer above it before the stack.
+      textseg_addr=0x60000000

       ;;
   esac
   if [ -n "$textseg_addr" ]; then
       ;;
   esac
   if [ -n "$textseg_addr" ]; then


@@ -4127,8 +4150,6 @@ echo "xen support       $xen"
 echo "brlapi support    $brlapi"
 echo "bluez  support    $bluez"
 echo "Documentation     $docs"
 echo "brlapi support    $brlapi"
 echo "bluez  support    $bluez"
 echo "Documentation     $docs"

-[ ! -z "$uname_release" ] && \
-echo "uname -r          $uname_release"

 echo "GUEST_BASE        $guest_base"
 echo "PIE               $pie"
 echo "vde support       $vde"
 echo "GUEST_BASE        $guest_base"
 echo "PIE               $pie"
 echo "vde support       $vde"


@@ -4150,7 +4171,9 @@ echo "libcap-ng support $cap_ng"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"
 echo "Trace backend     $trace_backend"
 echo "vhost-net support $vhost_net"
 echo "vhost-scsi support $vhost_scsi"
 echo "Trace backend     $trace_backend"

+if test "$trace_backend" = "simple"; then

 echo "Trace output file $trace_file-<pid>"
 echo "Trace output file $trace_file-<pid>"

+fi

 if test "$spice" = "yes"; then
 echo "spice support     $spice ($spice_protocol_version/$spice_server_version)"
 else
 if test "$spice" = "yes"; then
 echo "spice support     $spice ($spice_protocol_version/$spice_server_version)"
 else


@@ -4349,6 +4372,7 @@ if test "$modules" = "yes"; then
 fi
 if test "$sdl" = "yes" ; then
   echo "CONFIG_SDL=y" >> $config_host_mak
 fi
 if test "$sdl" = "yes" ; then
   echo "CONFIG_SDL=y" >> $config_host_mak

+  echo "CONFIG_SDLABI=$sdlabi" >> $config_host_mak

   echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
 fi
 if test "$cocoa" = "yes" ; then
   echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
 fi
 if test "$cocoa" = "yes" ; then


@@ -4432,6 +4456,7 @@ fi
 echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak
 echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
 if test "$gtk" = "yes" ; then
   echo "CONFIG_GTK=y" >> $config_host_mak

+  echo "CONFIG_GTKABI=$gtkabi" >> $config_host_mak

   echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
 fi
 if test "$vte" = "yes" ; then
   echo "GTK_CFLAGS=$gtk_cflags" >> $config_host_mak
 fi
 if test "$vte" = "yes" ; then


@@ -4494,8 +4519,8 @@ fi
 
 if test "$smartcard_nss" = "yes" ; then
   echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
 
 if test "$smartcard_nss" = "yes" ; then
   echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak

-  echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
-  echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
+  echo "NSS_LIBS=$nss_libs" >> $config_host_mak
+  echo "NSS_CFLAGS=$nss_cflags" >> $config_host_mak

 fi
 
 if test "$libusb" = "yes" ; then
 fi
 
 if test "$libusb" = "yes" ; then


@@ -4541,8 +4566,6 @@ if [ "$bsd" = "yes" ] ; then
   echo "CONFIG_BSD=y" >> $config_host_mak
 fi
 
   echo "CONFIG_BSD=y" >> $config_host_mak
 fi
 

-echo "CONFIG_UNAME_RELEASE=\"$uname_release\"" >> $config_host_mak
-

 if test "$zero_malloc" = "yes" ; then
   echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak
 fi
 if test "$zero_malloc" = "yes" ; then
   echo "CONFIG_ZERO_MALLOC=y" >> $config_host_mak
 fi


@@ -5181,7 +5204,7 @@ do
 done
 mkdir -p $DIRS
 for f in $FILES ; do
 done
 mkdir -p $DIRS
 for f in $FILES ; do

-    if [ -e "$source_path/$f" ] && [ "$source_path" != `pwd` ]; then
+    if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" != "y" ]; then

         symlink "$source_path/$f" "$f"
     fi
 done
         symlink "$source_path/$f" "$f"
     fi
 done


@@ -5217,3 +5240,4 @@ printf " '%s'" "$0" "$@" >>config.status
 echo >>config.status
 chmod +x config.status
 
 echo >>config.status
 chmod +x config.status
 

+rm -r "$TMPDIR1"