From 98792e077bf9c5a721586f4117b381beefc7ba72 Mon Sep 17 00:00:00 2001
From: trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Jan 2009 15:02:22 +0000
Subject: Support ldap library names with non-alphanumeric characters, such as
 libldap-2.4.so.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@737705 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES           | 2 ++
 build/apu-conf.m4 | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 00278335..75308a39 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 74c07237..976065d4 100644
--- a/build/apu-conf.m4
+++ b/build/apu-conf.m4
@@ -187,8 +187,12 @@ AC_DEFUN([APU_FIND_LDAPLIB], [
   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}"
-- 
cgit v1.2.1