mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-30 04:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix 5.1 detection on ubuntu natty

Browse Source
This commit is contained in:
Hannes Magnusson 2011-06-27 20:28:30 +00:00
parent 39a15706cd
commit 74c6b76093
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/dba/config.m4
View File

@ -311,7 +311,7 @@ if test "$PHP_DB4" != "no"; then
PHP_DBA_STD_BEGIN PHP_DBA_STD_BEGIN
dbdp4="/usr/local/BerkeleyDB.4." dbdp4="/usr/local/BerkeleyDB.4."
dbdp5="/usr/local/BerkeleyDB.5." dbdp5="/usr/local/BerkeleyDB.5."
for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do
if test -f "$i/db5/db.h"; then if test -f "$i/db5/db.h"; then
THIS_PREFIX=$i THIS_PREFIX=$i
THIS_INCLUDE=$i/db5/db.h THIS_INCLUDE=$i/db5/db.h
@ -320,6 +320,10 @@ if test "$PHP_DB4" != "no"; then
THIS_PREFIX=$i THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h THIS_INCLUDE=$i/db4/db.h
break break
elif test -f "$i/include/db5.1/db.h"; then
THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.1/db.h
break
elif test -f "$i/include/db5.0/db.h"; then elif test -f "$i/include/db5.0/db.h"; then
THIS_PREFIX=$i THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db5.0/db.h THIS_INCLUDE=$i/include/db5.0/db.h
@ -358,7 +362,7 @@ if test "$PHP_DB4" != "no"; then
break break
fi fi
done done
PHP_DBA_DB_CHECK(4, db-5.0 db-4.8 db-4.7 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)]) PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 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 fi
PHP_DBA_STD_RESULT(db4,Berkeley DB4) PHP_DBA_STD_RESULT(db4,Berkeley DB4)