[Libguestfs] [PATCH] daemon: Fix configure check so it requires hivex.

Richard W.M. Jones rjones at redhat.com
Mon Sep 18 15:43:10 UTC 2017


Commit 4d3601eb4ed1e314a8d4944a09a7f81638396cb6 made it clear that
ocaml-hivex is required, implying also that hivex is required.
However the configure test was still optional, and if you built
libguestfs without hivex you got a very long and confusing error in
the daemon/ subdirectory.

Thanks: Cédric Bosdonnat
---
 m4/guestfs_daemon.m4 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/m4/guestfs_daemon.m4 b/m4/guestfs_daemon.m4
index 522cd5f0e..52079950a 100644
--- a/m4/guestfs_daemon.m4
+++ b/m4/guestfs_daemon.m4
@@ -93,15 +93,13 @@ AC_CHECK_LIB([cap],[cap_from_text],[
     ], [])
 ],[AC_MSG_WARN([Linux capabilities library (libcap) not found])])
 
-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.
+dnl hivex library (required)
 PKG_CHECK_MODULES([HIVEX], [hivex],[
     AC_SUBST([HIVEX_CFLAGS])
     AC_SUBST([HIVEX_LIBS])
     AC_DEFINE([HAVE_HIVEX],[1],[hivex library found at compile time.])
 ],
-    [AC_MSG_WARN([hivex not found, some core features will be disabled])])
+    [AC_MSG_FAILURE([hivex library is required])])
 AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"])
 
 dnl systemd journal library (optional)
-- 
2.13.2




More information about the Libguestfs mailing list