You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
92 lines
3.2 KiB
92 lines
3.2 KiB
diff -up php-7.0.2RC1/ext/dba/config.m4.libdb php-7.0.2RC1/ext/dba/config.m4 |
|
--- php-7.0.2RC1/ext/dba/config.m4.libdb 2015-12-27 07:54:48.669923462 +0100 |
|
+++ php-7.0.2RC1/ext/dba/config.m4 2015-12-27 07:55:03.607947034 +0100 |
|
@@ -312,61 +312,13 @@ if test "$PHP_DB4" != "no"; then |
|
dbdp4="/usr/local/BerkeleyDB.4." |
|
dbdp5="/usr/local/BerkeleyDB.5." |
|
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 |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/db5/db.h |
|
- break |
|
- elif test -f "$i/db4/db.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/db4/db.h |
|
- break |
|
- elif test -f "$i/include/db5.3/db.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db5.3/db.h |
|
- 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 |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db5.0/db.h |
|
- break |
|
- elif test -f "$i/include/db4.8/db.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db4.8/db.h |
|
- break |
|
- elif test -f "$i/include/db4.7/db.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db4.7/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 |
|
- break |
|
- elif test -f "$i/include/db4/db.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db4/db.h |
|
- break |
|
- elif test -f "$i/include/db/db4.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db/db4.h |
|
- break |
|
- elif test -f "$i/include/db4.h"; then |
|
- THIS_PREFIX=$i |
|
- THIS_INCLUDE=$i/include/db4.h |
|
- break |
|
- elif test -f "$i/include/db.h"; then |
|
+ if test -f "$i/include/db.h"; then |
|
THIS_PREFIX=$i |
|
THIS_INCLUDE=$i/include/db.h |
|
break |
|
fi |
|
done |
|
- PHP_DBA_DB_CHECK(4, db-5.3 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)]) |
|
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
|
fi |
|
PHP_DBA_STD_RESULT(db4,Berkeley DB4) |
|
|
|
diff -up php-7.0.2RC1/ext/dba/dba.c.libdb php-7.0.2RC1/ext/dba/dba.c |
|
--- php-7.0.2RC1/ext/dba/dba.c.libdb 2015-12-22 16:19:29.000000000 +0100 |
|
+++ php-7.0.2RC1/ext/dba/dba.c 2015-12-27 07:52:30.381638216 +0100 |
|
@@ -52,6 +52,10 @@ |
|
#include "php_qdbm.h" |
|
#include "php_tcadb.h" |
|
|
|
+#ifdef DB4_INCLUDE_FILE |
|
+#include DB4_INCLUDE_FILE |
|
+#endif |
|
+ |
|
/* {{{ arginfo */ |
|
ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) |
|
ZEND_ARG_INFO(0, path) |
|
@@ -552,6 +556,10 @@ PHP_MINFO_FUNCTION(dba) |
|
|
|
php_info_print_table_start(); |
|
php_info_print_table_row(2, "DBA support", "enabled"); |
|
+#ifdef DB_VERSION_STRING |
|
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); |
|
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); |
|
+#endif |
|
if (handlers.s) { |
|
smart_str_0(&handlers); |
|
php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s));
|
|
|