diff options
| author | Joe Orton <jorton@apache.org> | 2009-03-25 13:40:47 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2009-03-25 13:40:47 +0000 |
| commit | 8ada42a8d94760a601683f9552eff2e3594bcfeb (patch) | |
| tree | be8bd5e679c80be087b7847d98007377b9415ca1 /build/apu-conf.m4 | |
| parent | 3217193d4ab704e481dbef31f18a5a69aec280c6 (diff) | |
| download | apr-8ada42a8d94760a601683f9552eff2e3594bcfeb.tar.gz | |
* build/apu-conf.m4 (APU_TRY_EXPAT_LINK): Add INCLUDES to CPPFLAGS when testing
the link; restore CPPFLAGS afterwards.
(APU_SYSTEM_EXPAT): Don't save/restore LDFLAGS since it's expected that
LDFLAGS will be changed on success. Stop manipulating CPPFLAGS in sync
with INCLUDES.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@758253 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/apu-conf.m4')
| -rw-r--r-- | build/apu-conf.m4 | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4 index 969f689fd..99ff8a9b1 100644 --- a/build/apu-conf.m4 +++ b/build/apu-conf.m4 @@ -59,11 +59,14 @@ dnl AC_DEFUN([APU_TRY_EXPAT_LINK], [ AC_CACHE_CHECK([$1], [$2], [ apu_expat_LIBS=$LIBS + apu_expat_CPPFLAGS=$CPPFLAGS LIBS="$LIBS $4" + CPPFLAGS="$CPPFLAGS $INCLUDES" AC_TRY_LINK([#include <stdlib.h> #include <$3>], [XML_ParserCreate(NULL);], [$2=yes], [$2=no]) LIBS=$apu_expat_LIBS + CPPFLAGS=$apu_expat_CPPFLAGS ]) if test $[$2] = yes; then @@ -107,14 +110,12 @@ AC_DEFUN([APU_SYSTEM_EXPAT], [ if test $apu_has_expat = 0; then APR_ADDTO(LDFLAGS, [-L/usr/local/lib]) - APR_ADDTO(CPPFLAGS, [-I/usr/local/include]) + APR_ADDTO(INCLUDES, [-I/usr/local/include]) APU_TRY_EXPAT_LINK([Expat 1.95.x in /usr/local], - apu_cv_expat_usrlocal, [expat.h], [-lexpat], - [APR_ADDTO(INCLUDES, [-I/usr/local/include]) - APR_ADDTO(LDFLAGS, [-L/usr/local/lib])],[ + apu_cv_expat_usrlocal, [expat.h], [-lexpat], [], [ APR_REMOVEFROM(LDFLAGS, [-L/usr/local/lib]) - APR_REMOVEFROM(CPPFLAGS, [-I/usr/local/include]) + APR_REMOVEFROM(INCLUDES, [-I/usr/local/include]) ]) fi ]) @@ -126,7 +127,6 @@ dnl AC_DEFUN([APU_FIND_EXPAT], [ save_cppflags="$CPPFLAGS" -save_ldflags="$LDFLAGS" apu_has_expat=0 @@ -145,8 +145,6 @@ AC_ARG_WITH([expat], else # Add given path to standard search paths if appropriate: if test "$withval" != "/usr"; then - APR_ADDTO(LDFLAGS, [-L$withval/lib]) - APR_ADDTO(CPPFLAGS, [-I$withval/include]) APR_ADDTO(INCLUDES, [-I$withval/include]) fi # ...and refuse to fall back on the builtin expat. @@ -175,7 +173,6 @@ APR_XML_DIR=$bundled_subdir AC_SUBST(APR_XML_DIR) CPPFLAGS=$save_cppflags -LDFLAGS=$save_ldflags ]) |