Author: trawick
Date: Mon Feb  9 17:47:40 2009
New Revision: 742653

URL: http://svn.apache.org/viewvc?rev=742653&view=rev
Log:
Backport LDAP config fixes from trunk revisions 737705, 737754, and 741150

Support ldap library names with non-alphanumeric characters, such
as libldap-2.4.so.

Allow the name of the lber library to be specified.

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.

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/build/apu-conf.m4

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=742653&r1=742652&r2=742653&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Mon Feb  9 17:47:40 2009
@@ -1,6 +1,12 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.5
 
+  *) 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]
+
   *) Suppress pgsql column-out-of-range warning.
      PR 46012 [Michiel van Loon <michiel van-loon.xs4all.nl>]
 

Modified: apr/apr-util/branches/1.3.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/apu-conf.m4?rev=742653&r1=742652&r2=742653&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/apu-conf.m4 Mon Feb  9 17:47:40 2009
@@ -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}"
@@ -231,6 +235,18 @@
 apu_has_ldap_other="0"
 LDADD_ldap=""
 
+AC_ARG_WITH(lber,[  --with-lber=library     lber library to use],
+  [
+    if test "$withval" = "yes"; then
+      apu_liblber_name="lber"
+    else
+      apu_liblber_name="$withval"
+    fi
+  ],
+  [
+    apu_liblber_name="lber"
+  ])
+
 AC_ARG_WITH(ldap-include,[  --with-ldap-include=path  path to ldap include files with trailing slash])
 AC_ARG_WITH(ldap-lib,[  --with-ldap-lib=path    path to ldap lib file])
 AC_ARG_WITH(ldap,[  --with-ldap=library     ldap library to use],
@@ -269,7 +285,8 @@
     fi
 
     test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
-    AC_CHECK_LIB(lber, 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>"])