Support ldap library names with non-alphanumeric characters, such
as libldap-2.4.so.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@737705 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
index 0027833..75308a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with APR-util 2.0.0
+ *) Support ldap library names with non-alphanumeric characters, such
+ as libldap-2.4.so. [Jeff Trawick]
Changes with APR-util 1.4.0
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
index 74c0723..976065d 100644
--- a/build/apu-conf.m4
+++ b/build/apu-conf.m4
@@ -187,8 +187,12 @@
if test ${apu_has_ldap} != "1"; then
ldaplib=$1
extralib=$2
- unset ac_cv_lib_${ldaplib}_ldap_init
- unset ac_cv_lib_${ldaplib}___ldap_init
+ # Clear the cache entry for subsequent APU_FIND_LDAPLIB invocations.
+ changequote(,)
+ ldaplib_cache_id="`echo $ldaplib | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
+ changequote([,])
+ unset ac_cv_lib_${ldaplib_cache_id}_ldap_init
+ unset ac_cv_lib_${ldaplib_cache_id}___ldap_init
AC_CHECK_LIB(${ldaplib}, ldap_init,
[
LDADD_ldap="-l${ldaplib} ${extralib}"
