[libxml2] Remove LIBS from XML_PRIVATE_LIBS

[Nick Wellnhofer <nwellnhof src gnome org>]

commit 1db151acebc9119b15515c6f347ed24c539257db
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Sun Apr 3 14:36:03 2022 +0200

    Remove LIBS from XML_PRIVATE_LIBS

 Makefile.am    | 1 +
 configure.ac   | 2 +-
 xml2-config.in | 2 +-
 xml2Conf.sh.in | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d6a4dc02..453c8e49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1236,6 +1236,7 @@ xml2Conf.sh: xml2Conf.sh.in Makefile
            -e 's?\@VERSION\@?$(VERSION)?g' \
            -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
            -e 's?\@XML_PRIVATE_LIBS\@?$(XML_PRIVATE_LIBS)?g' \
+           -e 's?\@LIBS\@?$(LIBS)?g' \
               < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
        && mv xml2Conf.tmp xml2Conf.sh
 
diff --git a/configure.ac b/configure.ac
index ea8e9f0d..3166e6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1311,7 +1311,7 @@ else
     fi
 fi
 XML_LIBS="-lxml2"
-XML_PRIVATE_LIBS="$Z_LIBS $LZMA_LIBS $THREAD_LIBS $ICONV_LIBS $ICU_LIBS $LIBM $WIN32_EXTRA_LIBADD $LIBS"
+XML_PRIVATE_LIBS="$Z_LIBS $LZMA_LIBS $THREAD_LIBS $ICONV_LIBS $ICU_LIBS $LIBM $WIN32_EXTRA_LIBADD"
 XML_LIBTOOLLIBS="libxml2.la"
 AC_SUBST(WITH_ICU)
 
diff --git a/xml2-config.in b/xml2-config.in
index 099e2409..bda32211 100644
--- a/xml2-config.in
+++ b/xml2-config.in
@@ -86,7 +86,7 @@ while test $# -gt 0; do
             shift
             libs="@XML_LIBS@"
         else
-            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@"
+            libs="@XML_LIBS@ @XML_PRIVATE_LIBS@ @MODULE_PLATFORM_LIBS@ @LIBS@"
         fi
 
         if [ "@XML_LIBDIR@" != "-L/usr/lib" -a "@XML_LIBDIR@" != "-L/usr/lib64" ]; then
diff --git a/xml2Conf.sh.in b/xml2Conf.sh.in
index 31228c0b..c1910e13 100644
--- a/xml2Conf.sh.in
+++ b/xml2Conf.sh.in
@@ -2,7 +2,7 @@
 # Configuration file for using the XML library in GNOME applications
 #
 XML2_LIBDIR="@XML_LIBDIR@"
-XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@"
+XML2_LIBS="@XML_LIBS@ @XML_PRIVATE_LIBS@ @LIBS@"
 XML2_INCLUDEDIR="@XML_INCLUDEDIR@"
 MODULE_VERSION="xml2-@VERSION@"