sixd                                     Wed, 01 Dec 2010 19:20:16 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=305894

Log:
Add Berkeley DB 5.1 support to the DBA extension

Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/dba/config.m4
    U   php/php-src/trunk/ext/dba/config.m4

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-12-01 17:52:21 UTC (rev 305893)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-12-01 19:20:16 UTC (rev 305894)
@@ -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)


Modified: php/php-src/branches/PHP_5_3/ext/dba/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dba/config.m4      2010-12-01 17:52:21 UTC 
(rev 305893)
+++ php/php-src/branches/PHP_5_3/ext/dba/config.m4      2010-12-01 19:20:16 UTC 
(rev 305894)
@@ -233,7 +233,7 @@
     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
     ],[

Modified: php/php-src/trunk/ext/dba/config.m4
===================================================================
--- php/php-src/trunk/ext/dba/config.m4 2010-12-01 17:52:21 UTC (rev 305893)
+++ php/php-src/trunk/ext/dba/config.m4 2010-12-01 19:20:16 UTC (rev 305894)
@@ -268,7 +268,7 @@
     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
     ],[

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to