Allow the name of the lber library to be specified.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@737754 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 17 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index 75308a39..71fc32bc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,10 @@
                                                      -*- 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]
+  *) 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.
+     [Jeff Trawick]
 
 Changes with APR-util 1.4.0
 
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
index 976065d4..cc0cf008 100644
--- a/build/apu-conf.m4
+++ b/build/apu-conf.m4
@@ -235,6 +235,18 @@ apu_has_ldap_zos="0"
 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],
@@ -273,7 +285,7 @@ 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(lber, ber_init)
+    AC_CHECK_LIB($apu_liblber_name, ber_init)
 
     AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])