apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r560688 - /apr/apr-util/trunk/build/apu-conf.m4
Date Sun, 29 Jul 2007 07:14:51 GMT
Author: jerenkrantz
Date: Sun Jul 29 00:14:50 2007
New Revision: 560688

URL: http://svn.apache.org/viewvc?view=rev&rev=560688
Log:
Fix up r493791 by properly exporting library path when --with-expat specified.

* build/apu-conf.m4
  (APU_SYSTEM_EXPAT): If it lives in /usr/local/lib, set APRUTIL_LDFLAGS.
  (APU_FIND_EXPAT): Properly save/restore CPPFLAGS/LDFLAGS and set
  APRUTIL_LDFLAGS when withval is set.

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?view=diff&rev=560688&r1=560687&r2=560688
==============================================================================
--- apr/apr-util/trunk/build/apu-conf.m4 (original)
+++ apr/apr-util/trunk/build/apu-conf.m4 Sun Jul 29 00:14:50 2007
@@ -111,7 +111,8 @@
  
     APU_TRY_EXPAT_LINK([Expat 1.95.x in /usr/local], 
        apu_cv_expat_usrlocal, [expat.h], [-lexpat],
-       [APR_ADDTO(APRUTIL_INCLUDES, [-I/usr/local/include])],[
+       [APR_ADDTO(APRUTIL_INCLUDES, [-I/usr/local/include])
+        APR_ADDTO(APRUTIL_LDFLAGS, [-L/usr/local/lib])],[
        APR_REMOVEFROM(LDFLAGS, [-L/usr/local/lib])
        APR_REMOVEFROM(CPPFLAGS, [-I/usr/local/include])
       ])
@@ -124,6 +125,9 @@
 dnl
 AC_DEFUN([APU_FIND_EXPAT], [
 
+save_cppflags="$CPPFLAGS"
+save_ldflags="$LDFLAGS"
+
 apu_has_expat=0
 
 # Default: will use either external or bundled expat.
@@ -144,6 +148,7 @@
       APR_ADDTO(LDFLAGS, [-L$withval/lib])
       APR_ADDTO(CPPFLAGS, [-I$withval/include])
       APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
     fi
     # ...and refuse to fall back on the builtin expat.
     apu_try_builtin_expat=0
@@ -169,6 +174,9 @@
 
 APR_XML_DIR=$bundled_subdir
 AC_SUBST(APR_XML_DIR)
+
+CPPFLAGS=$save_cppflags
+LDFLAGS=$save_ldflags
 ])
 
 



Mime
View raw message