package vala bindings

[packages/libguestfs.git] / augeas-libxml2.patch

diff --git a/augeas-libxml2.patch b/augeas-libxml2.patch
index ac09e81448165fb5bc8313f6fa8bec923422e552..12803a7ff524c776207659d423872dc02ed8fe43 100644 (file)
--- a/augeas-libxml2.patch
+++ b/augeas-libxml2.patch
@@ -1,36 +1,19 @@
---- 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 \
+diff -urNp -x '*.orig' libguestfs-1.40.2.org/daemon/Makefile.am libguestfs-1.40.2/daemon/Makefile.am
+--- libguestfs-1.40.2.org/daemon/Makefile.am   2019-02-07 15:45:56.644955783 +0100
++++ libguestfs-1.40.2/daemon/Makefile.am       2021-03-30 23:01:01.769494093 +0200
+@@ -222,6 +222,7 @@ guestfsd_LDADD = \
+       $(JANSSON_LIBS) \
+       $(SELINUX_LIBS) \
        $(AUGEAS_LIBS) \
 +      $(LIBXML2_LIBS) \
-       lib/libgnu.a \
-       $(GETADDRINFO_LIB) \
-       $(HOSTENT_LIB) \
-@@ -183,5 +184,5 @@
-       $(LIBINTL) \
-       $(SERVENT_LIB)
- 
--AM_CPPFLAGS = -I$(srcdir)/lib -Ilib
--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],[
+       $(HIVEX_LIBS) \
+       $(SD_JOURNAL_LIBS) \
+       $(top_builddir)/gnulib/lib/.libs/libgnu.a \
+@@ -255,6 +256,7 @@ guestfsd_CFLAGS = \
+       $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+       $(RPC_CFLAGS) \
+       $(AUGEAS_CFLAGS) \
++      $(LIBXML2_CFLAGS) \
+       $(HIVEX_CFLAGS) \
+       $(SD_JOURNAL_CFLAGS) \
+       $(JANSSON_CFLAGS) \