X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=93b6256e9c60cd7df289e9a5145fd6a9d67d0c9a;hb=b7d59e2cdaa73b42a2063a0653151bae20497074;hp=fda47730cf6a75077eed6c731950f2a56146369a;hpb=3c973b8a960dfde022a7d49b30b8c6d504a182e3;p=libguestfs.git

diff --git a/configure.ac b/configure.ac
index fda4773..93b6256 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 # major/minor/release must be numbers
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [0])
-m4_define([libguestfs_release], [82])
+m4_define([libguestfs_release], [86])
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
@@ -128,6 +128,9 @@ AC_SYS_LARGEFILE
 dnl Check sizeof long.
 AC_CHECK_SIZEOF([long])
 
+dnl Define a C symbol for the host CPU architecture.
+AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
+
 dnl Headers.
 AC_CHECK_HEADERS([errno.h sys/types.h sys/un.h sys/wait.h sys/socket.h endian.h byteswap.h])
 
@@ -173,7 +176,7 @@ dnl fallback to null vmchannel (still using SLIRP).  See the
 dnl discussion in the README file.
 if test "x$vmchannel_test" != "xno"; then
     AC_MSG_CHECKING([for guestfwd support in $QEMU])
-    if $QEMU --help | grep -sq guestfwd; then
+    if $QEMU -nographic --help | grep -sq guestfwd; then
         AC_MSG_RESULT([yes])
         vmchannel_guestfwd=guestfwd
     else
@@ -182,7 +185,7 @@ if test "x$vmchannel_test" != "xno"; then
         # test failing.  This is because recent qemu will throw
         # up an SDL window and hang if we try to run this test.
         AC_MSG_CHECKING([for "-net channel" (old guestfwd) support in $QEMU])
-        vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:`
+        vmchannelout=`$QEMU -nographic -net channel /dev/zero 2>&1 ||:`
         echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
         if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then
             AC_MSG_RESULT([yes])
@@ -194,7 +197,7 @@ if test "x$vmchannel_test" != "xno"; then
     fi
 
     AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU])
-    if $QEMU --help | grep -sq -- "-net user"; then
+    if $QEMU -nographic --help | grep -sq -- "-net user"; then
         AC_MSG_RESULT([yes])
         vmchannel_net_user=yes
     else
@@ -227,13 +230,13 @@ fi
 dnl Set drive interface used by the guestfs_add_drive{,_ro} calls
 dnl ('-drive ...,if=...' option to qemu).
 dnl
-dnl NB. We will change the default in future to virtio, but at the
-dnl moment this causes a performance problem, RHBZ#509383.
+dnl If you encounter performance problems with virtio (RHBZ#509383)
+dnl then try '--with-drive-if=ide'.
 AC_ARG_WITH([drive-if],
         [AS_HELP_STRING([--with-drive-if],
-          [set default driver (ide|scsi|virtio) @<:@default=ide@:>@])],
+          [set default driver (ide|scsi|virtio) @<:@default=virtio@:>@])],
         [],
-        [with_drive_if=ide])
+        [with_drive_if=virtio])
 AC_DEFINE_UNQUOTED([DRIVE_IF],["$with_drive_if"],[Default drive interface.])
 
 dnl Set interface used by the network.  Normally you should
@@ -335,9 +338,6 @@ AC_ARG_WITH([updates],
 UPDATES="$with_updates"
 AC_SUBST(UPDATES)
 
-dnl Define a symbol for the host CPU architecture.
-AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
-
 dnl --with-mirror to specify a local Fedora mirror.
 AC_ARG_WITH([mirror],
         [AS_HELP_STRING([--with-mirror],
@@ -422,10 +422,16 @@ dnl For i18n.
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.17])
 
-dnl libxml2 is used by the hivex library.
-PKG_CHECK_MODULES([LIBXML2], [libxml-2.0])
-AC_SUBST([LIBXML2_CFLAGS])
-AC_SUBST([LIBXML2_LIBS])
+dnl hivex library (highly recommended).
+dnl This used to be a part of libguestfs, but was spun off into its
+dnl own separate upstream project in libguestfs 1.0.85.
+HAVE_HIVEX=yes
+PKG_CHECK_MODULES([HIVEX], [hivex],,[
+        HAVE_HIVEX=no
+        AC_MSG_WARN([Hivex library and headers are missing, so optional Windows Registry tools won't be built])])
+AM_CONDITIONAL([HAVE_HIVEX],[test "x$HAVE_HIVEX" = "xyes"])
+AC_SUBST([HIVEX_CFLAGS])
+AC_SUBST([HIVEX_LIBS])
 
 dnl FUSE is optional to build the FUSE module.
 HAVE_FUSE=yes
@@ -736,7 +742,6 @@ AC_CONFIG_FILES([Makefile
                  libguestfs.pc
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile
-                 hivex/Makefile
                  fuse/Makefile
                  ocaml/META perl/Makefile.PL])
 AC_OUTPUT