You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2009/01/26 16:02:23 UTC

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

Author: trawick
Date: Mon Jan 26 15:02:22 2009
New Revision: 737705

URL: http://svn.apache.org/viewvc?rev=737705&view=rev
Log:
Support ldap library names with non-alphanumeric characters, such
as libldap-2.4.so.

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=737705&r1=737704&r2=737705&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Mon Jan 26 15:02:22 2009
@@ -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
 

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?rev=737705&r1=737704&r2=737705&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Mon Jan 26 15:02:22 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}"



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

Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, Jan 26, 2009 at 10:02 AM, <tr...@apache.org> wrote:

> Author: trawick
> Date: Mon Jan 26 15:02:22 2009
> New Revision: 737705
>
> URL: http://svn.apache.org/viewvc?rev=737705&view=rev
> Log:
> Support ldap library names with non-alphanumeric characters, such
> as libldap-2.4.so.
>
> Modified: apr/apr-util/trunk/build/apu-conf.m4
> URL:
> http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?rev=737705&r1=737704&r2=737705&view=diff
>
> ==============================================================================
> --- apr/apr-util/trunk/build/apu-conf.m4 (original)
> +++ apr/apr-util/trunk/build/apu-conf.m4 Mon Jan 26 15:02:22 2009
> @@ -187,8 +187,12 @@
>   if test ${apu_has_ldap} != "1"; then
>     ldaplib=$1
>     extralib=$2
> -    unset ac_cv_lib_${ldaplib}_ldap_init


Any idea if this symbol (e.g., "ac_cv_ldap_ldap_init") is actually set,
maybe by old autoconf?  The bug reporter commented on that in
https://issues.apache.org/bugzilla/show_bug.cgi?id=13427

The form with three underbars prior to the function name
("ac_cv_ldap___ldap_init") is also what I see.