shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-01-26 10:03:34 +03:00
Code

autoconf: Don't bake build time CFLAGS into pkg-config file

Browse Source 
Having slept on it, I've realised that baking the dependency CFLAGS into
the pkg-config file is pointless when it is only used to link against
them. It may even cause problems.
This commit is contained in:
James Le Cuirot 2023-09-04 09:25:44 +01:00
parent efcaeadc3e
commit 6864d92f6c
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -288,7 +288,6 @@ fi
XML_PRIVATE_LIBS=
XML_PRIVATE_CFLAGS=
XML_PC_LIBS=
XML_PC_CFLAGS=
XML_PC_REQUIRES=
dnl
@ -994,7 +993,6 @@ else
else
Z_LIBS="-lz"
fi])
XML_PC_CFLAGS="${XML_PC_CFLAGS} ${Z_CFLAGS}"
XML_PC_LIBS="${XML_PC_LIBS} ${Z_LIBS}"
)
CPPFLAGS=$_cppflags
@ -1045,7 +1043,6 @@ else
else
LZMA_LIBS="-llzma"
fi])
XML_PC_CFLAGS="${XML_PC_CFLAGS} ${LZMA_CFLAGS}"
XML_PC_LIBS="${XML_PC_LIBS} ${LZMA_LIBS}"
)
CPPFLAGS=$_cppflags
@ -1128,7 +1125,6 @@ else
WITH_ICU=1
ICU_CFLAGS=`${ICU_CONFIG} --cflags`
ICU_LIBS=`${ICU_CONFIG} --ldflags`
XML_PC_CFLAGS="${XML_PC_CFLAGS} ${ICU_CFLAGS}"
XML_PC_LIBS="${XML_PC_LIBS} ${ICU_LIBS}"
else
_cppflags="${CPPFLAGS}"
@ -1147,7 +1143,6 @@ else
ICU_CFLAGS="-I$ICU_DIR/include"
ICU_LIBS="-L$ICU_DIR/lib $ICU_LIBS"
fi])])
XML_PC_CFLAGS="${XML_PC_CFLAGS} ${ICU_CFLAGS}"
XML_PC_LIBS="${XML_PC_LIBS} ${ICU_LIBS}"
CPPFLAGS=$_cppflags
LIBS=$_libs
@ -1194,10 +1189,8 @@ AM_SUBST_NOTMAKE(XML_PC_PRIVATE)
AM_SUBST_NOTMAKE(XML_PC_LIBS_PRIVATE)
AC_SUBST(XML_PC_LIBS)
AC_SUBST(XML_PC_CFLAGS)
AC_SUBST(XML_PC_REQUIRES)
AM_SUBST_NOTMAKE(XML_PC_LIBS)
AM_SUBST_NOTMAKE(XML_PC_CFLAGS)
AM_SUBST_NOTMAKE(XML_PC_REQUIRES)
AC_SUBST(AM_CFLAGS)

2
libxml-2.0-uninstalled.pc.in
View File

@ -9,4 +9,4 @@ Version: @VERSION@
Description: libXML library version2.
Requires@XML_PC_PRIVATE@: @XML_PC_REQUIRES@
Libs: -L${libdir} @XML_LIBS@ @XML_PC_LIBS_PRIVATE@ @XML_PC_LIBS@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ @XML_PC_CFLAGS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@

2
libxml-2.0.pc.in
View File

@ -9,4 +9,4 @@ Version: @VERSION@
Description: libXML library version2.
Requires@XML_PC_PRIVATE@: @XML_PC_REQUIRES@
Libs: -L${libdir} @XML_LIBS@ @XML_PC_LIBS_PRIVATE@ @XML_PC_LIBS@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ @XML_PC_CFLAGS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@