diff options
| -rw-r--r-- | appliance/packagelist.in | 1 | ||||
| -rw-r--r-- | daemon/Makefile.am | 3 | ||||
| -rw-r--r-- | daemon/configure.ac | 23 |
3 files changed, 16 insertions, 11 deletions
diff --git a/appliance/packagelist.in b/appliance/packagelist.in index d56eae1c..72b1fcda 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -105,6 +105,7 @@ gawk grep gzip jfsutils +libxml2 lsof lvm2 mdadm diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3fe8c882..524fc38b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -172,6 +172,7 @@ guestfsd_SOURCES = \ guestfsd_LDADD = \ liberrnostring.a \ libprotocol.a \ + $(AUGEAS_LIBS) \ lib/libgnu.a \ $(GETADDRINFO_LIB) \ $(HOSTENT_LIB) \ @@ -182,4 +183,4 @@ guestfsd_LDADD = \ $(SERVENT_LIB) AM_CPPFLAGS = -I$(srcdir)/lib -Ilib -guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) +guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) diff --git a/daemon/configure.ac b/daemon/configure.ac index 7a6c04aa..82540d4e 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -154,16 +154,19 @@ AC_CHECK_PROG([GPERF],[gperf],[gperf],[no]) test "x$GPERF" = "xno" && AC_MSG_ERROR([gperf must be installed]) -dnl Check for Augeas (now optional). -AC_CHECK_LIB([augeas],[aug_match],[ - LIBS="-laugeas $LIBS" - have_augeas=yes - dnl Check for functions not available in earlier versions of Augeas. - AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) - ],[have_augeas=no]) -if test "x$have_augeas" = "xyes"; then - AC_DEFINE([HAVE_AUGEAS],[1],[Define to 1 if you have Augeas]) -fi +dnl Check for Augeas (optional). +PKG_CHECK_MODULES([AUGEAS], [augeas], + [AC_SUBST([AUGEAS_CFLAGS]) + AC_SUBST([AUGEAS_LIBS]) + AC_DEFINE([HAVE_AUGEAS],[1],[Define to 1 if you have Augeas]) + + old_LIBS="$LIBS" + LIBS="$LIBS $AUGEAS_LIBS" + dnl Check for functions not available in earlier versions of Augeas. + AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode]) + LIBS="$old_LIBS" + ], + [AC_MSG_WARN([augeas not found, some core features will be disabled])]) dnl Check for libselinux (optional). AC_CHECK_HEADERS([selinux/selinux.h]) |