]>
Commit | Line | Data |
---|---|---|
1 | --- php-7.1.1/ext/dba/config.m4.orig 2017-01-17 21:44:40.000000000 +0100 | |
2 | +++ php-7.1.1/ext/dba/config.m4 2017-01-27 22:08:45.385645468 +0100 | |
3 | @@ -245,7 +245,7 @@ | |
4 | ],[ | |
5 | AC_EGREP_CPP(yes,[ | |
6 | #include "$THIS_INCLUDE" | |
7 | -#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5) | |
8 | +#if DB_VERSION_MAJOR == $1 || ($1 == 4 && (DB_VERSION_MAJOR == 5 || DB_VERSION_MAJOR == 6)) | |
9 | yes | |
10 | #endif | |
11 | ],[ | |
12 | @@ -322,10 +322,26 @@ | |
13 | THIS_PREFIX=$i | |
14 | THIS_INCLUDE=$i/db4/db.h | |
15 | break | |
16 | + elif test -f "$i/include/db6.2/db.h"; then | |
17 | + THIS_PREFIX=$i | |
18 | + THIS_INCLUDE=$i/include/db6.2/db.h | |
19 | + break | |
20 | + elif test -f "$i/include/db6.1/db.h"; then | |
21 | + THIS_PREFIX=$i | |
22 | + THIS_INCLUDE=$i/include/db6.1/db.h | |
23 | + break | |
24 | + elif test -f "$i/include/db6.0/db.h"; then | |
25 | + THIS_PREFIX=$i | |
26 | + THIS_INCLUDE=$i/include/db6.0/db.h | |
27 | + break | |
28 | elif test -f "$i/include/db5.3/db.h"; then | |
29 | THIS_PREFIX=$i | |
30 | THIS_INCLUDE=$i/include/db5.3/db.h | |
31 | break | |
32 | + elif test -f "$i/include/db5.2/db.h"; then | |
33 | + THIS_PREFIX=$i | |
34 | + THIS_INCLUDE=$i/include/db5.2/db.h | |
35 | + break | |
36 | elif test -f "$i/include/db5.1/db.h"; then | |
37 | THIS_PREFIX=$i | |
38 | THIS_INCLUDE=$i/include/db5.1/db.h | |
39 | @@ -366,7 +384,7 @@ | |
40 | break | |
41 | fi | |
42 | done | |
43 | - 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)]) | |
44 | + PHP_DBA_DB_CHECK(4, db-6.2 db-6.1 db-6.0 db-5.3 db-5.2 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)]) | |
45 | fi | |
46 | PHP_DBA_STD_RESULT(db4,Berkeley DB4) | |
47 |