X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=aa757dc83f3a8e47e4a093f8ccb5cade82342b10;hp=7d71a7da2fca4f39c195d171b06b308548cbe059;hb=84bcb4dbee2f3b359409e911deaf82e6e5d0ab43;hpb=33ad9f02e17e8dbcbcf4a751315394e520569f14

diff --git a/configure.ac b/configure.ac
index 7d71a7d..aa757dc 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], [81])
+m4_define([libguestfs_release], [86])
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
@@ -227,13 +227,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
@@ -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
@@ -717,8 +723,6 @@ AC_CONFIG_FILES([appliance/supermin-split.sh],
                 [chmod +x appliance/supermin-split.sh])
 AC_CONFIG_FILES([appliance/supermin-make.sh],
                 [chmod +x appliance/supermin-make.sh])
-AC_CONFIG_FILES([appliance/libguestfs-supermin-helper],
-                [chmod +x appliance/libguestfs-supermin-helper])
 AC_CONFIG_FILES([Makefile
                  src/Makefile fish/Makefile po/Makefile.in examples/Makefile
                  appliance/Makefile
@@ -738,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