svn commit: r741150 - in /apr/apr-util/trunk: CHANGES build/apu-conf.m4

[tr...@apache.org]

Author: trawick
Date: Thu Feb  5 15:48:18 2009
New Revision: 741150

URL: http://svn.apache.org/viewvc?rev=741150&view=rev
Log:
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/trunk/CHANGES
    apr/apr-util/trunk/build/apu-conf.m4

Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=741150&r1=741149&r2=741150&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Thu Feb  5 15:48:18 2009
@@ -4,6 +4,7 @@
   *) 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

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?rev=741150&r1=741149&r2=741150&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Thu Feb  5 15:48:18 2009
@@ -285,7 +285,8 @@
     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>"])