Author: jorton
Date: Wed Oct 10 14:23:13 2007
New Revision: 583621

URL: http://svn.apache.org/viewvc?rev=583621&view=rev
Log:
Merge r560688 from trunk:

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.

PR: 43337
Submitted by: jerenkrantz
Reviewed by: jorton

Modified:
    apr/apr-util/branches/1.2.x/CHANGES
    apr/apr-util/branches/1.2.x/build/apu-conf.m4

Modified: apr/apr-util/branches/1.2.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/CHANGES?rev=583621&r1=583620&r2=583621&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.2.x/CHANGES [utf-8] Wed Oct 10 14:23:13 2007
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.2.11
 
+  *) Fix exported LDFLAGS with new expat detection.  PR 43337.
+     [Justin Erenkrantz]
+
   *) Add MySQL DBD driver [Nick Kew, Bojan Smojver]
 
 Changes with APR-util 1.2.10

Modified: apr/apr-util/branches/1.2.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/apu-conf.m4?rev=583621&r1=583620&r2=583621&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/apu-conf.m4 Wed Oct 10 14:23:13 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
 ])