diff options
| author | Marcus Boerger <helly@php.net> | 2007-12-06 14:02:21 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2007-12-06 14:02:21 +0000 |
| commit | df88c2071c676d625a8cee8802474a13161c9afa (patch) | |
| tree | 85f75168bb778e5b4625d73717cfb01510e0a0d0 | |
| parent | 2464454e870dcc60ca73f4f4479c0d04c70ec37e (diff) | |
| download | php-git-df88c2071c676d625a8cee8802474a13161c9afa.tar.gz | |
- MFB: DB 4.6 detection
| -rw-r--r-- | ext/dba/config.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index b64ecbb377..66976481b0 100644 --- a/ext/dba/config.m4 +++ b/ext/dba/config.m4 @@ -274,11 +274,16 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ # 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 @@ if test "$PHP_DB4" != "no"; then 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) |