From: Richard Jones <rjones@redhat.com>
Date: Sat, 11 Sep 2010 16:16:22 +0000 (+0100)
Subject: build: hivex is required.
X-Git-Tag: 1.5.13~6
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=9f653edcdc6ecceb7a22441e496f1fc08a95f56c

build: hivex is required.

hivex library has been required since we moved the inspection
code to C.  Check for this in configure.ac.
---

diff --git a/README b/README
index aa43bbb..e231840 100644
--- a/README
+++ b/README
@@ -61,7 +61,7 @@ Requirements
 
 - genisoimage / mkisofs
 
-- (Optional) hivex >= 1.2.1 to build Windows Registry support
+- hivex >= 1.2.1 (http://libguestfs.org/download)
 
 - (Optional) FUSE to build the FUSE module
 
diff --git a/configure.ac b/configure.ac
index 0f8853d..4a7d6e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,14 +483,10 @@ PKG_CHECK_MODULES([AUGEAS], [augeas])
 AC_SUBST([AUGEAS_CFLAGS])
 AC_SUBST([AUGEAS_LIBS])
 
-dnl hivex library (highly recommended).
+dnl hivex library (required)
 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"])
+PKG_CHECK_MODULES([HIVEX], [hivex])
 AC_SUBST([HIVEX_CFLAGS])
 AC_SUBST([HIVEX_LIBS])