cvs: php-src(PHP_4_3) /ext/dba config.m4

From: Date: Sat, 25 Sep 2004 15:32:20 +0000
Subject: cvs: php-src(PHP_4_3) /ext/dba config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-28770@lists.php.net to get a copy of this message
helly Sat Sep 25 11:32:20 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/dba config.m4 Log: MFH lib substituation http://cvs.php.net/diff.php/php-src/ext/dba/config.m4?r1=1.29.2.25&r2=1.29.2.26&ty=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.29.2.25 php-src/ext/dba/config.m4:1.29.2.26 --- php-src/ext/dba/config.m4:1.29.2.25 Sun Mar 7 19:01:03 2004 +++ php-src/ext/dba/config.m4 Sat Sep 25 11:32:20 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.29.2.25 2004/03/08 00:01:03 helly Exp $ +dnl $Id: config.m4,v 1.29.2.26 2004/09/25 15:32:20 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -11,8 +11,11 @@ AC_DEFUN(PHP_TEMP_LDFLAGS,[ old_LDFLAGS=$LDFLAGS LDFLAGS="$1 $LDFLAGS" - $2 + old_LIBS=$LIBS + LIBS="$2 $LIBS" + $3 LDFLAGS=$old_LDFLAGS + LIBS=$old_LIBS ]) dnl Assign INCLUDE/LFLAGS from PREFIX @@ -134,7 +137,7 @@ AC_DEFUN(PHP_DBA_DB_CHECK,[ for LIB in $2; do if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[ + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" ],[ @@ -171,7 +174,7 @@ ]) fi if test "$ext_shared" = "yes"; then - AC_MSG_CHECKING(if db can be used as shared extension) + AC_MSG_CHECKING(if dba can be used as shared extension) AC_EGREP_CPP(yes,[ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)

« previous php.cvs (#28770) next »