You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2008/04/23 00:16:36 UTC
svn commit: r650677 - /apr/apr-util/branches/1.2.x/build/dbm.m4
Author: wrowe
Date: Tue Apr 22 15:16:23 2008
New Revision: 650677
URL: http://svn.apache.org/viewvc?rev=650677&view=rev
Log:
* build/dbm.m4 (APU_CHECK_DBM): Fix gdbm detection to use LDFLAGS
rather than LIBS, and to save/restore both that and CPPFLAGS correctly.
Submitted by: Philip M. Gollucci, jorton
Backports: r649458
Modified:
apr/apr-util/branches/1.2.x/build/dbm.m4
Modified: apr/apr-util/branches/1.2.x/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/dbm.m4?rev=650677&r1=650676&r2=650677&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/dbm.m4 Tue Apr 22 15:16:23 2008
@@ -672,8 +672,10 @@
elif test "$withval" = "no"; then
apu_have_gdbm=0
else
- CPPFLAGS="-I$withval/include"
- LIBS="-L$withval/lib "
+ saved_cppflags="$CPPFLAGS"
+ saved_ldflags="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
+ LDFLAGS="$LDFLAGS -L$withval/lib "
AC_MSG_CHECKING(checking for gdbm in $withval)
AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
@@ -681,6 +683,8 @@
APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
fi
+ CPPFLAGS="$saved_cppflags"
+ LDFLAGS="$saved_ldflags"
fi
])