1--- config.m4.orig	2016-01-06 15:14:47 UTC
2+++ config.m4
3@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
4       THIS_PREFIX=$i
5       THIS_INCLUDE=$i/include/db5.3/db.h
6       break
7+    elif test -f "$i/include/db5/db.h"; then
8+      THIS_PREFIX=$i
9+      THIS_INCLUDE=$i/include/db5/db.h
10+      break
11+    elif test -f "$i/include/db48/db.h"; then
12+      THIS_PREFIX=$i
13+      THIS_INCLUDE=$i/include/db48/db.h
14+      break
15+    elif test -f "$i/include/db47/db.h"; then
16+      THIS_PREFIX=$i
17+      THIS_INCLUDE=$i/include/db47/db.h
18+      break
19+    elif test -f "$i/include/db46/db.h"; then
20+      THIS_PREFIX=$i
21+      THIS_INCLUDE=$i/include/db46/db.h
22+      break
23+    elif test -f "$i/include/db44/db.h"; then
24+      THIS_PREFIX=$i
25+      THIS_INCLUDE=$i/include/db44/db.h
26+      break
27+    elif test -f "$i/include/db43/db.h"; then
28+      THIS_PREFIX=$i
29+      THIS_INCLUDE=$i/include/db43/db.h
30+      break
31+    elif test -f "$i/include/db42/db.h"; then
32+      THIS_PREFIX=$i
33+      THIS_INCLUDE=$i/include/db42/db.h
34+      break
35+    elif test -f "$i/include/db41/db.h"; then
36+      THIS_PREFIX=$i
37+      THIS_INCLUDE=$i/include/db41/db.h
38+      break
39     elif test -f "$i/include/db5.1/db.h"; then
40       THIS_PREFIX=$i
41       THIS_INCLUDE=$i/include/db5.1/db.h
42@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
43       break
44     fi
45   done
46-  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)])
47+  PHP_DBA_DB_CHECK(4, db-5 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)])
48 fi
49 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
50
51