svn commit: r442082 - /httpd/apreq/trunk/acinclude.m4

[pg...@apache.org]

Author: pgollucci
Date: Sun Sep 10 20:47:29 2006
New Revision: 442082

URL: http://svn.apache.org/viewvc?view=rev&rev=442082
Log:
Apparently SunOS (tested 5.10) doesn't like -lexpat and -lhttpd/lib/libexpat.so to be specified simultaneously

In this case, we now strip -lexpat and use the one from httpd.

ld: fatal: recording name conflict: file `/usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/../../../libexpat.so' and file `httpd/lib/libexpat.so' 
provide identical dependency names: libexpat.so.0  (possible multiple inclusion of the same file)



Modified:
    httpd/apreq/trunk/acinclude.m4

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?view=diff&rev=442082&r1=442081&r2=442082
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Sun Sep 10 20:47:29 2006
@@ -158,9 +158,19 @@
         APU_LA="`$APU_CONFIG --apu-la-file`"
         APR_ADDTO([APR_LTFLAGS], "`$APR_CONFIG --link-libtool`")
         APR_ADDTO([APR_LTFLAGS], "`$APU_CONFIG --link-libtool`")
+
         dnl perl glue/tests do not use libtool: need ld linker flags
-        APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
         APR_ADDTO([APR_LIBS], "`$APR_CONFIG --libs`")
+
+        dnl ld: fatal: recording name conflict: file `/usr/sfw/lib/gcc/i386-pc-solaris2.10/3.4.3/../../../libexpat.so' and file `httpd/lib/libexpat.so' 
+        dnl provide identical dependency names: libexpat.so.0  (possible multiple inclusion of the same file)
+        if test "x$OS" = "xsolaris"; then
+            APU_LIBS=`$APU_CONFIG --libs | $PERL -pe 's,-lexpat,,'`
+            APR_ADDTO([APR_LIBS], "$APU_LIBS")
+        else
+            APR_ADDTO([APR_LIBS], "`$APU_CONFIG --libs`")
+        fi
+
         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
         APR_ADDTO([APR_LDFLAGS], "`$APR_CONFIG --link-ld --ldflags`")