summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-09-11 17:16:22 +0100
committerRichard Jones <rjones@redhat.com>2010-09-11 17:16:22 +0100
commit9f653edcdc6ecceb7a22441e496f1fc08a95f56c (patch)
treebe3607430cb8119c3244490f3c3b61e11fce1ade
parentf565e71560862e9fa3e6d000c5f8fa6deb7e90e0 (diff)
downloadlibguestfs-9f653edcdc6ecceb7a22441e496f1fc08a95f56c.tar.gz
libguestfs-9f653edcdc6ecceb7a22441e496f1fc08a95f56c.tar.xz
libguestfs-9f653edcdc6ecceb7a22441e496f1fc08a95f56c.zip
build: hivex is required.
hivex library has been required since we moved the inspection code to C. Check for this in configure.ac.
-rw-r--r--README2
-rw-r--r--configure.ac8
2 files changed, 3 insertions, 7 deletions
diff --git a/README b/README
index aa43bbbc..e231840d 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 0f8853d4..4a7d6e66 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])