summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2009-02-05 15:48:18 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2009-02-05 15:48:18 +0000
commit226fa1198b4d1bfe8779d80f623746a974b82895 (patch)
tree63821aa6d4388bac9eec79f09b2ce286fa180755
parent1d2549a6444b91e7ee4dcf3f9d0619f01a6cdc5d (diff)
downloadlibapr-util-226fa1198b4d1bfe8779d80f623746a974b82895.tar.gz
Fix a problem reporting the lber library from apu-N-config.
It wouldn't be reported if you override the default ldap library name using --with-ldap=FOO. git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@741150 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES1
-rw-r--r--build/apu-conf.m43
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 71fc32bc..be4fe142 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ Changes with APR-util 2.0.0
*) LDAP detection improvements: --with-ldap now supports library names
containing non-alphanumeric characters, such as libldap-2.4.so. New
option --with-lber can be used to override the default liblber name.
+ Fix a problem reporting the lber library from apu-N-config.
[Jeff Trawick]
Changes with APR-util 1.4.0
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
index cc0cf008..9eb9b606 100644
--- a/build/apu-conf.m4
+++ b/build/apu-conf.m4
@@ -285,7 +285,8 @@ dnl The iPlanet C SDK 5.0 is as yet untested...
fi
test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
- AC_CHECK_LIB($apu_liblber_name, ber_init)
+ AC_CHECK_LIB($apu_liblber_name, ber_init,
+ [LDADD_ldap="${LDADD_ldap} -l${apu_liblber_name}"])
AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])