block: Use bdrv_has_zero_init_truncate()

[qemu.git] / configure

diff --git a/configure b/configure
index eb635c3b9a5501c2f813ab25ca6deca37e284786..714e7fb6a1fbd72ccdcd92b506cedf68b80d8a5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -294,6 +294,7 @@ audio_drv_list=""
 block_drv_rw_whitelist=""
 block_drv_ro_whitelist=""
 host_cc="cc"
 block_drv_rw_whitelist=""
 block_drv_ro_whitelist=""
 host_cc="cc"

+libs_cpu=""

 libs_softmmu=""
 libs_tools=""
 audio_pt_int=""
 libs_softmmu=""
 libs_tools=""
 audio_pt_int=""


@@ -322,7 +323,7 @@ else
         echo "to acquire QEMU source archives. Non-GIT builds are only"
         echo "supported with source archives linked from:"
         echo
         echo "to acquire QEMU source archives. Non-GIT builds are only"
         echo "supported with source archives linked from:"
         echo

-        echo "  https://www.qemu.org/download/"
+        echo "  https://www.qemu.org/download/#source"

         echo
         echo "Developers working with GIT can use scripts/archive-source.sh"
         echo "if they need to create valid source archives."
         echo
         echo "Developers working with GIT can use scripts/archive-source.sh"
         echo "if they need to create valid source archives."


@@ -1751,7 +1752,7 @@ disabled with --disable-FEATURE, default is enabled if available:
   guest-agent     build the QEMU Guest Agent
   guest-agent-msi build guest agent Windows MSI installation package
   pie             Position Independent Executables
   guest-agent     build the QEMU Guest Agent
   guest-agent-msi build guest agent Windows MSI installation package
   pie             Position Independent Executables

-  modules         modules support
+  modules         modules support (non-Windows)

   debug-tcg       TCG debugging (default is disabled)
   debug-info      debugging information
   sparse          sparse checker
   debug-tcg       TCG debugging (default is disabled)
   debug-info      debugging information
   sparse          sparse checker


@@ -2006,6 +2007,11 @@ else
   QEMU_CFLAGS="$QEMU_CFLAGS -Wno-missing-braces"
 fi
 
   QEMU_CFLAGS="$QEMU_CFLAGS -Wno-missing-braces"
 fi
 

+# Our module code doesn't support Windows
+if test "$modules" = "yes" && test "$mingw32" = "yes" ; then
+  error_exit "Modules are not available for Windows"
+fi
+

 # Static linking is not possible with modules or PIE
 if test "$static" = "yes" ; then
   if test "$modules" = "yes" ; then
 # Static linking is not possible with modules or PIE
 if test "$static" = "yes" ; then
   if test "$modules" = "yes" ; then


@@ -5042,12 +5048,12 @@ case "$capstone" in
     else
       LIBCAPSTONE=libcapstone.a
     fi
     else
       LIBCAPSTONE=libcapstone.a
     fi

-    LIBS="-L\$(BUILD_DIR)/capstone -lcapstone $LIBS"
+    libs_cpu="-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu"

     ;;
 
   system)
     QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"
     ;;
 
   system)
     QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"

-    LIBS="$($pkg_config --libs capstone) $LIBS"
+    libs_cpu="$($pkg_config --libs capstone) $libs_cpu"

     ;;
 
   no)
     ;;
 
   no)


@@ -6537,6 +6543,7 @@ echo "qemu_helperdir=$libexecdir" >> $config_host_mak
 echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
 echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
 echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak
 echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
 echo "qemu_icondir=$qemu_icondir" >> $config_host_mak
 echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak

+echo "libs_cpu=$libs_cpu" >> $config_host_mak

 echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
 echo "GIT=$git" >> $config_host_mak
 echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
 echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
 echo "GIT=$git" >> $config_host_mak
 echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak