apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r438795 - /apr/apr-util/trunk/build/apu-conf.m4
Date Thu, 31 Aug 2006 05:04:40 GMT
Author: jerenkrantz
Date: Wed Aug 30 22:04:40 2006
New Revision: 438795

URL: http://svn.apache.org/viewvc?rev=438795&view=rev
Log:
* build/apu-conf.m4
  (APU_TEST_EXPAT): Support Solaris /usr/sfw installs of Expat.

Modified:
    apr/apr-util/trunk/build/apu-conf.m4

Modified: apr/apr-util/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/apu-conf.m4?rev=438795&r1=438794&r2=438795&view=diff
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Wed Aug 30 22:04:40 2006
@@ -79,8 +79,15 @@
     expat_libtool="$1/lib64/libexpat.la"
   elif test -r "$1/include/expat.h" -a \
     -r "$1/lib/libexpat.a"; then
-    dnl Expat 1.95.* installation (without libtool)
+    dnl Expat 1.95.* static installation (without libtool)
     dnl FreeBSD textproc/expat2
+    expat_include_dir="$1/include"
+    expat_ldflags="-L$1/lib"
+    expat_libs="-lexpat"
+  elif test -r "$1/include/expat.h" -a \
+    -r "$1/lib/libexpat.so"; then
+    dnl Expat 1.95.* shared installation (without libtool)
+    dnl Solaris 10 /usr/sfw
     expat_include_dir="$1/include"
     expat_ldflags="-L$1/lib"
     expat_libs="-lexpat"



Mime
View raw message