[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apreq-cvs
Subject:    svn commit: r674684 - /httpd/apreq/trunk/acinclude.m4
From:       bojan () apache ! org
Date:       2008-07-08 0:16:45
Message-ID: 20080708001645.8A0E2238899B () eris ! apache ! org
[Download RAW message or body]

Author: bojan
Date: Mon Jul  7 17:16:45 2008
New Revision: 674684

URL: http://svn.apache.org/viewvc?rev=674684&view=rev
Log:
Use --avoid-ldap with apu-1-config where available.

Modified:
    httpd/apreq/trunk/acinclude.m4

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?rev=674684&r1=674683&r2=674684&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Mon Jul  7 17:16:45 2008
@@ -179,10 +179,18 @@
         dnl provide identical dependency names: libexpat.so.0  
         dnl (possible multiple inclusion of the same file)
         if test "x$OS" = "xsolaris"; then
-            APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'`
+            if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
+                APU_LIBS=`$APU_CONFIG --avoid-ldap --libs | $PERL -pe 's,-lexpat,,'`
+            else
+                APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'`
+            fi
             APR_ADDTO([APR_LIBS], "$APU_LIBS")
         else
-            APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
+            if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
+                APR_ADDTO([APR_LIBS], "`$APU_CONFIG --avoid-ldap --libs`")
+            else
+                APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
+            fi
         fi
 
         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")


[prev in list] [next in list] [prev in thread] [next in thread]