X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=augeas-libxml2.patch;h=a1ef4c88cd499db76ca4bc5222a71e71f5514570;hb=312283b57da60f1264b1f4132d88ca2dd1d2502a;hp=961a3dc4632f4b130514209b0aa916adacfe29cd;hpb=475fb908ba61ab861255c8ae7df8d05212c2ce1b;p=packages%2Flibguestfs.git

diff --git a/augeas-libxml2.patch b/augeas-libxml2.patch
index 961a3dc..a1ef4c8 100644
--- a/augeas-libxml2.patch
+++ b/augeas-libxml2.patch
@@ -1,16 +1,18 @@
---- 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 \
- 	libprotocol.a \
+--- libguestfs-1.20.1/daemon/Makefile.am.orig	2013-01-06 17:34:27.347761080 +0100
++++ libguestfs-1.20.1/daemon/Makefile.am	2013-01-06 17:35:26.284426518 +0100
+@@ -189,6 +189,7 @@
+ 	$(YAJL_LIBS) \
+ 	$(SELINUX_LIB) \
  	$(AUGEAS_LIBS) \
 +	$(LIBXML2_LIBS) \
- 	lib/libgnu.a \
+ 	$(HIVEX_LIBS) \
+ 	$(top_builddir)/gnulib/lib/.libs/libgnu.a \
  	$(GETADDRINFO_LIB) \
- 	$(HOSTENT_LIB) \
-@@ -183,4 +184,4 @@
- 	$(SERVENT_LIB)
+@@ -203,6 +204,7 @@
+ guestfsd_CFLAGS = \
+ 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+ 	$(AUGEAS_CFLAGS) \
++	$(LIBXML2_CFLAGS) \
+ 	$(HIVEX_CFLAGS) \
+ 	$(YAJL_CFLAGS)
  
- AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
--guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
-+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS) $(LIBXML2_CFLAGS)