diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -55,6 +55,8 @@ Requirements - libxml2 +- Augeas (http://augeas.net/) + - squashfs-tools (mksquashfs only) - genisoimage / mkisofs @@ -63,8 +65,6 @@ Requirements - (Optional) FUSE to build the FUSE module -- (Optional) Augeas (http://augeas.net/) - - perldoc (pod2man, pod2text) to generate the manual pages and other documentation. diff --git a/configure.ac b/configure.ac index 11126f6e..5aecee32 100644 --- a/configure.ac +++ b/configure.ac @@ -478,6 +478,11 @@ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0]) AC_SUBST([LIBXML2_CFLAGS]) AC_SUBST([LIBXML2_LIBS]) +dnl Augeas (required) +PKG_CHECK_MODULES([AUGEAS], [augeas]) +AC_SUBST([AUGEAS_CFLAGS]) +AC_SUBST([AUGEAS_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. diff --git a/src/Makefile.am b/src/Makefile.am index f2eb6c9b..4c5468bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -113,7 +113,7 @@ libguestfs_la_SOURCES = \ proto.c \ libguestfs.syms -libguestfs_la_LIBADD = $(HIVEX_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la +libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(LIBPCRE) $(LIBMAGIC) $(LTLIBTHREAD) ../gnulib/lib/libgnu.la # Make libguestfs include the convenience library. noinst_LTLIBRARIES = libprotocol.la @@ -121,7 +121,7 @@ libguestfs_la_LIBADD += libprotocol.la libguestfs_la_CFLAGS = \ -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \ - $(HIVEX_CFLAGS) \ + $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) libguestfs_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib |