c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove LIBS from XML_PRIVATE_LIBS

Browse Source
This commit is contained in:
Nick Wellnhofer 2022-04-03 14:36:03 +02:00
parent cf6cd81c3e
commit 1db151aceb
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -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

2
configure.ac
View File

@ -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)

2
xml2-config.in
View File

@ -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

2
xml2Conf.sh.in
View File

@ -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@"