# HG changeset patch # User Nick Wellnhofer <wellnhofer@aevum.de> # Date 1622971806 -7200 # Sun Jun 06 11:30:06 2021 +0200 # Node ID 23712ecd9dfe5164b7bb19e8addacdca50b16639 # Parent 562e54724728334f3682fd276eb29f3386f0418f Remove redundant flags from pkg-config files Flags for dependencies are automatically pulled in by "Requires". There's no need to list them separately. Add libxslt as requirement of libexslt. Fixes #53. diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -475,7 +475,6 @@ set(EXSLT_INCLUDEDIR "-I\${includedir}") set(EXSLT_LIBDIR "-L\${libdir}") -set(EXSLT_LIBS "-lexslt ${XSLT_LIBS}") set(EXSLT_PRIVATE_LIBS "${XSLT_PRIVATE_LIBS} ${LIBGCRYPT_LIBS}") file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}") diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -687,11 +687,9 @@ EXSLT_LIBDIR='-L${libdir}' EXSLT_INCLUDEDIR='-I${includedir}' -EXSLT_LIBS="-lexslt $XSLT_LIBS" EXSLT_PRIVATE_LIBS="$XSLT_PRIVATE_LIBS $LIBGCRYPT_LIBS" AC_SUBST(EXSLT_LIBDIR) AC_SUBST(EXSLT_INCLUDEDIR) -AC_SUBST(EXSLT_LIBS) AC_SUBST(EXSLT_PRIVATE_LIBS) AC_SUBST(EXTRA_LIBS) diff --git a/libexslt.pc.in b/libexslt.pc.in --- a/libexslt.pc.in +++ b/libexslt.pc.in @@ -7,7 +7,7 @@ Name: libexslt Version: @LIBEXSLT_VERSION@ Description: EXSLT Extension library -Requires: libxml-2.0 +Requires: libxml-2.0, libxslt Cflags: @EXSLT_INCLUDEDIR@ -Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@ +Libs: @EXSLT_LIBDIR@ -lexslt Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/libxslt.pc.in b/libxslt.pc.in --- a/libxslt.pc.in +++ b/libxslt.pc.in @@ -9,5 +9,5 @@ Description: XSLT library version 2. Requires: libxml-2.0 Cflags: @XSLT_INCLUDEDIR@ -Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@ +Libs: @XSLT_LIBDIR@ -lxslt Libs.private: @XSLT_PRIVATE_LIBS@