|
 |
196963 |
--- php-5.4.7/ext/dba/config.m4.orig 2012-09-20 12:23:00.548322754 +0200
|
|
|
196963 |
+++ php-5.4.7/ext/dba/config.m4 2012-09-20 12:28:07.656380829 +0200
|
|
|
196963 |
@@ -312,57 +312,13 @@
|
|
|
196963 |
dbdp4="/usr/local/BerkeleyDB.4."
|
|
|
196963 |
dbdp5="/usr/local/BerkeleyDB.5."
|
|
|
196963 |
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
|
|
|
196963 |
- if test -f "$i/db5/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/db5/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/db4/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/db4/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db5.1/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db5.1/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db5.0/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db5.0/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4.8/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4.8/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4.7/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4.7/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4.6/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4.6/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4.5/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4.5/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4/db.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4/db.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db/db4.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db/db4.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db4.h"; then
|
|
|
196963 |
- THIS_PREFIX=$i
|
|
|
196963 |
- THIS_INCLUDE=$i/include/db4.h
|
|
|
196963 |
- break
|
|
|
196963 |
- elif test -f "$i/include/db.h"; then
|
|
|
196963 |
+ if test -f "$i/include/db.h"; then
|
|
|
196963 |
THIS_PREFIX=$i
|
|
|
196963 |
THIS_INCLUDE=$i/include/db.h
|
|
|
196963 |
break
|
|
|
196963 |
fi
|
|
|
196963 |
done
|
|
|
196963 |
- 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)])
|
|
|
196963 |
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
|
|
|
196963 |
fi
|
|
|
196963 |
PHP_DBA_STD_RESULT(db4,Berkeley DB4)
|
|
|
196963 |
|