helly Thu Dec 6 14:17:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dba config.m4
Log:
-MFH: db 4.6 detection
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2.2.8&r2=1.70.2.2.2.9&diff_format=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.70.2.2.2.8
php-src/ext/dba/config.m4:1.70.2.2.2.9
--- php-src/ext/dba/config.m4:1.70.2.2.2.8 Thu Jul 19 10:50:16 2007
+++ php-src/ext/dba/config.m4 Thu Dec 6 14:17:43 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.70.2.2.2.8 2007/07/19 10:50:16 jani Exp $
+dnl $Id: config.m4,v 1.70.2.2.2.9 2007/12/06 14:17:43 helly Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -274,11 +274,16 @@
# DB4
if test "$PHP_DB4" != "no"; then
PHP_DBA_STD_BEGIN
- for i in $PHP_DB4 /usr/local/BerkeleyDB.4.2 /usr/local/BerkeleyDB.4.1
/usr/local/BerkeleyDB.4.0 /usr/local /usr; do
+ dbdp="/usr/local/BerkeleyDB.4."
+ for i in $PHP_DB4 ${dbdp}6 ${dbdp}5 ${dbdp}4 ${dbdp}3 ${dbdp}2 ${dbdp}1
${dbdp}0 /usr/local /usr; do
if test -f "$i/db4/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h
break
+ elif test -f "$i/include/db4.6/db.h"; then
+ THIS_PREFIX=$i
+ THIS_INCLUDE=$i/include/db4.6/db.h
+ break
elif test -f "$i/include/db4.5/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4.5/db.h
@@ -301,7 +306,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db,
[(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4
db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
