augeas-libxml2.patch

   1 --- libguestfs-1.12.11/daemon/Makefile.am~      2011-12-22 20:05:03.000000000 +0100
   2 +++ libguestfs-1.12.11/daemon/Makefile.am       2012-03-16 18:49:15.259588154 +0100
   3 @@ -173,6 +173,7 @@
   4         liberrnostring.a \
   5         libprotocol.a \
   6         $(AUGEAS_LIBS) \
   7 +       $(LIBXML2_LIBS) \
   8         lib/libgnu.a \
   9         $(GETADDRINFO_LIB) \
  10         $(HOSTENT_LIB) \
  11 @@ -183,5 +184,5 @@
  12         $(LIBINTL) \
  13         $(SERVENT_LIB)
  14
  15 -AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
  16 -guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
  17 +AM_CPPFLAGS = -I$(srcdir)/lib -Ilib $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)
  18 +guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)
  19 --- libguestfs-1.12.11/daemon/configure.ac~     2011-12-22 20:06:47.000000000 +0100
  20 +++ libguestfs-1.12.11/daemon/configure.ac      2012-03-16 20:17:43.343161378 +0100
  21 @@ -168,6 +168,15 @@
  22          ],
  23          [AC_MSG_WARN([augeas not found, some core features will be disabled])])
  24
  25 +dnl libxml2 (highly recommended)
  26 +PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
  27 +        [AC_SUBST([LIBXML2_CFLAGS])
  28 +         AC_SUBST([LIBXML2_LIBS])
  29 +         AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
  30 +        ],
  31 +        [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
  32 +AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
  33 +
  34  dnl Check for libselinux (optional).
  35  AC_CHECK_HEADERS([selinux/selinux.h])
  36  AC_CHECK_LIB([selinux],[setexeccon],[