summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2010-12-01 19:20:16 +0000
committerChristopher Jones <sixd@php.net>2010-12-01 19:20:16 +0000
commit2024790fd2eff931e98ea8ee9799a900f6522b58 (patch)
tree3770b661a0a4725967ca848a7dea0e5e42f53cf1
parentd506ce8d941f9edd74fdde954decd1fe7c56086a (diff)
downloadphp-git-2024790fd2eff931e98ea8ee9799a900f6522b58.tar.gz
Add Berkeley DB 5.1 support to the DBA extension
-rw-r--r--NEWS3
-rw-r--r--ext/dba/config.m42
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index eb51f45201..7b41dd8081 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@
(Gustavo, Ilia)
. Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted). (Ilia)
+- DBA extension:
+ . Added Berkeley DB 5.1 support to the DBA extension. (Oracle Corp.)
+
- DOM extension:
. Fixed bug #52656 (DOMCdataSection does not work with splitText). (Ilia)
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index ff98a1cc05..f0d9d29014 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -233,7 +233,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
AC_MSG_CHECKING([for DB4 minor version and patch level])
AC_EGREP_CPP(yes,[
#include "$THIS_INCLUDE"
-#if DB_VERSION_MINOR != 1 || (DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25)
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR != 1) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1 && DB_VERSION_PATCH >= 25)
yes
#endif
],[