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.

35 lines
1.4 KiB

  1. From: Stefan Fritsch <sf@debian.org>
  2. Subject: Make apu-config not output dbm libs by default. See #622081
  3. --- a/apu-config.in
  4. +++ b/apu-config.in
  5. @@ -32,7 +32,8 @@ INCLUDES="@APRUTIL_INCLUDES@"
  6. LDFLAGS="@APRUTIL_LDFLAGS@"
  7. ORIG_LDAP_LIBS="@LDADD_ldap@"
  8. LDAP_LIBS=""
  9. -DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
  10. +ORIG_DBM_LIBS="@LDADD_dbm_db@ @LDADD_dbm_gdbm@ @LDADD_dbm_ndbm@"
  11. +DBM_LIBS=""
  12. APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
  13. @@ -58,8 +59,8 @@ Known values for OPTION are:
  14. --libs print library information
  15. --avoid-ldap do not include ldap library information with --libs (default on OpenWrt)
  16. --ldap-libs print library information to link with ldap
  17. - --avoid-dbm do not include DBM library information with --libs
  18. - --dbm-libs print additional library information to link with DBM
  19. + --avoid-dbm do not include DBM library information with --libs (default on OpenWrt)
  20. + --dbm-libs print library information to link with DBM
  21. --srcdir print APR-util source directory
  22. --link-ld print link switch(es) for linking to APR-util
  23. --link-libtool print the libtool inputs for linking to APR-util
  24. @@ -125,7 +126,7 @@ while test $# -gt 0; do
  25. flags="$flags $ORIG_LDAP_LIBS"
  26. ;;
  27. --dbm-libs)
  28. - flags="$flags $DBM_LIBS"
  29. + flags="$flags $ORIG_DBM_LIBS"
  30. ;;
  31. --includedir)
  32. if test "$location" = "installed"; then