diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | apr-util.pc.in | 2 | ||||
| -rw-r--r-- | apu-config.in | 8 |
3 files changed, 10 insertions, 6 deletions
@@ -8,9 +8,9 @@ Changes with APR-util 1.3.0 *) Modularize ldap's stub with the dbd dso modular structure, and teach the apu dso's to respect the system specific shared lib path var. - To link to the native ldap libs, query `apu-1-config --ldap-libs` - (in addition to the usual linker queries for compiling and linking). - [William Rowe] + To link to an application without ldap libs, query + `apu-1-config --avoid-ldap --libs` (in addition to the usual linker + queries for compiling and linking). [William Rowe] *) Support building DBD drivers as DSOs by default; use --disable-util-dso flag to configure to use static link. [Joe Orton, Bojan Smojver] diff --git a/apr-util.pc.in b/apr-util.pc.in index 9e3cda6a..5b146af3 100644 --- a/apr-util.pc.in +++ b/apr-util.pc.in @@ -9,5 +9,5 @@ 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@ @APRUTIL_EXPORT_LIBS@ +Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@ Cflags: -I${includedir} diff --git a/apu-config.in b/apu-config.in index 650aab4e..87c00efa 100644 --- a/apu-config.in +++ b/apu-config.in @@ -54,7 +54,8 @@ Known values for OPTION are: --includedir print location where headers are installed --ldflags print linker flags --libs print library information - --ldap-libs print additional library information to link with ldap + --avoid-ldap do not include ldap library information with --libs + --ldap-libs print library information to link with ldap --srcdir print APR-util source directory --link-ld print link switch(es) for linking to APR-util --link-libtool print the libtool inputs for linking to APR-util @@ -111,8 +112,11 @@ while test $# -gt 0; do echo $bindir exit 0 ;; + --avoid-ldap) + LDAP_LIBS="" + ;; --libs) - flags="$flags $LIBS" + flags="$flags $LDAP_LIBS $LIBS" ;; --ldap-libs) flags="$flags $LDAP_LIBS" |