httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r783546 - /httpd/apreq/trunk/acinclude.m4
Date Wed, 10 Jun 2009 22:07:54 GMT
Author: bojan
Date: Wed Jun 10 22:07:54 2009
New Revision: 783546

URL: http://svn.apache.org/viewvc?rev=783546&view=rev
Log:
Prepare for --avoid-dbm option to apu-1-config.

Modified:
    httpd/apreq/trunk/acinclude.m4

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?rev=783546&r1=783545&r2=783546&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Wed Jun 10 22:07:54 2009
@@ -173,25 +173,25 @@
         dnl perl glue/tests do not use libtool: need ld linker flags
         APR_ADDTO([APR_LIBS], "`$APR_CONFIG --libs`")
 
+        apu_avoid_libs=""
+        if $APU_CONFIG --avoid-ldap >/dev/null 2>&1; then
+            apu_avoid_libs="--avoid-ldap"
+        fi
+        if $APU_CONFIG --avoid-dbm >/dev/null 2>&1; then
+            apu_avoid_libs="--avoid-dbm $apu_avoid_libs"
+        fi
+
         dnl ld: fatal: recording name conflict: 
         dnl file `/usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/../../../libexpat.so' and
         dnl file `httpd/lib/libexpat.so' 
         dnl provide identical dependency names: libexpat.so.0  
         dnl (possible multiple inclusion of the same file)
         if test "x$OS" = "xsolaris"; then
-            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")
+            APU_LIBS="`$APU_CONFIG $apu_avoid_libs --libs | $PERL -pe 's,-lexpat,,'`"
         else
-            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
+            APU_LIBS="`$APU_CONFIG $apu_avoid_libs --libs`"
         fi
+        APR_ADDTO([APR_LIBS], "$APU_LIBS")
 
         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
         APR_ADDTO([APR_LDFLAGS], "`$APR_CONFIG --link-ld --ldflags`")



Mime
View raw message