|
From: Peter Samuelson <peter@p12n.org>
|
|
Subject: Prevent recursive linking of dependent libraries by apr-util users.
|
|
|
|
---
|
|
apr-util.pc.in | 5 +++--
|
|
apu-config.in | 2 +-
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/apr-util.pc.in
|
|
+++ b/apr-util.pc.in
|
|
@@ -8,6 +8,7 @@ Name: APR Utils
|
|
Description: Companion library for APR
|
|
Version: @APRUTIL_DOTTED_VERSION@
|
|
# assume that apr-util requires libapr of same major version
|
|
-Requires: apr-@APRUTIL_MAJOR_VERSION@
|
|
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
|
|
+Requires.private: apr-@APRUTIL_MAJOR_VERSION@
|
|
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@
|
|
+Libs.private: @APRUTIL_EXPORT_LIBS@
|
|
Cflags: -I${includedir}
|
|
--- a/apu-config.in
|
|
+++ b/apu-config.in
|
|
@@ -27,7 +27,7 @@ bindir="@bindir@"
|
|
libdir="@libdir@"
|
|
includedir="@includedir@"
|
|
|
|
-LIBS="@APRUTIL_EXPORT_LIBS@"
|
|
+LIBS=
|
|
INCLUDES="@APRUTIL_INCLUDES@"
|
|
LDFLAGS="@APRUTIL_LDFLAGS@"
|
|
ORIG_LDAP_LIBS="@LDADD_ldap@"
|