You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

31 lines
964 B

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