diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:48 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:48 -0400 |
| commit | eddbbea4325e602ddc87c545531609132d4f0e3b (patch) | |
| tree | f0994206a7e0a6251be7cc6729ba480f0c8729c2 /ext/dba | |
| parent | 2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (diff) | |
| download | php-eddbbea4325e602ddc87c545531609132d4f0e3b.tar.gz | |
Imported Upstream version 5.2.3upstream/5.2.3
Diffstat (limited to 'ext/dba')
| -rw-r--r-- | ext/dba/config.m4 | 9 | ||||
| -rwxr-xr-x | ext/dba/tests/bug36436.phpt | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 5fceba71b..0c9215203 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70.2.2.2.4 2006/12/05 17:54:52 iliaa Exp $ +dnl $Id: config.m4,v 1.70.2.2.2.5 2007/05/21 11:38:53 tony2001 Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -172,6 +172,7 @@ dnl parameters(version, library list, function) AC_DEFUN([PHP_DBA_DB_CHECK],[ for LIB in $2; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + lib_found=""; PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" @@ -185,10 +186,14 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ #endif ],[ THIS_LIBS=$LIB - break + lib_found=1 ]) ]) ]) + if test -n "$lib_found"; then + lib_found=""; + break; + fi fi done if test -z "$THIS_LIBS"; then diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt index e85cf8528..60470660e 100755 --- a/ext/dba/tests/bug36436.phpt +++ b/ext/dba/tests/bug36436.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #36436 DBA problem with Berkeley DB4 +Bug #36436 (DBA problem with Berkeley DB4) --SKIPIF-- <?php $handler = 'db4'; |