---- libguestfs-1.12.11/daemon/Makefile.am~ 2011-12-22 20:05:03.000000000 +0100
-+++ libguestfs-1.12.11/daemon/Makefile.am 2012-03-16 18:49:15.259588154 +0100
-@@ -173,6 +173,7 @@
- liberrnostring.a \
+--- libguestfs-1.18.8/daemon/Makefile.am.orig 2012-09-22 18:00:42.405492006 +0200
++++ libguestfs-1.18.8/daemon/Makefile.am 2012-09-22 18:02:10.678823499 +0200
+@@ -171,6 +171,7 @@
libprotocol.a \
+ $(SELINUX_LIB) \
$(AUGEAS_LIBS) \
+ $(LIBXML2_LIBS) \
- lib/libgnu.a \
+ $(top_builddir)/gnulib/lib/.libs/libgnu.a \
$(GETADDRINFO_LIB) \
$(HOSTENT_LIB) \
-@@ -183,5 +184,5 @@
- $(LIBINTL) \
+@@ -181,6 +182,6 @@
$(SERVENT_LIB)
--AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
+ guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
-+AM_CPPFLAGS = -I$(srcdir)/lib -Ilib $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)
---- libguestfs-1.12.11/daemon/configure.ac~ 2011-12-22 20:06:47.000000000 +0100
-+++ libguestfs-1.12.11/daemon/configure.ac 2012-03-16 20:17:43.343161378 +0100
-@@ -168,6 +168,15 @@
- ],
- [AC_MSG_WARN([augeas not found, some core features will be disabled])])
-+dnl libxml2 (highly recommended)
-+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0],
-+ [AC_SUBST([LIBXML2_CFLAGS])
-+ AC_SUBST([LIBXML2_LIBS])
-+ AC_DEFINE([HAVE_LIBXML2],[1],[libxml2 found at compile time.])
-+ ],
-+ [AC_MSG_WARN([libxml2 not found, some core features will be disabled])])
-+AM_CONDITIONAL([HAVE_LIBXML2],[test "x$LIBXML2_LIBS" != "x"])
-+
- dnl Check for libselinux (optional).
- AC_CHECK_HEADERS([selinux/selinux.h])
- AC_CHECK_LIB([selinux],[setexeccon],[
+ .PHONY: force
projects / packages / libguestfs.git / blobdiff