bjori Mon, 27 Jun 2011 20:28:30 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312536
Log: Fix 5.1 detection on ubuntu natty Changed paths: U php/php-src/branches/PHP_5_3/ext/dba/config.m4 U php/php-src/branches/PHP_5_4/ext/dba/config.m4 U php/php-src/trunk/ext/dba/config.m4 Modified: php/php-src/branches/PHP_5_3/ext/dba/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/dba/config.m4 2011-06-27 17:24:55 UTC (rev 312535) +++ php/php-src/branches/PHP_5_3/ext/dba/config.m4 2011-06-27 20:28:30 UTC (rev 312536) @@ -276,7 +276,7 @@ PHP_DBA_STD_BEGIN dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do + 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 @@ -285,6 +285,10 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/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 @@ -323,7 +327,7 @@ break fi done - PHP_DBA_DB_CHECK(4, 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-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)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) Modified: php/php-src/branches/PHP_5_4/ext/dba/config.m4 =================================================================== --- php/php-src/branches/PHP_5_4/ext/dba/config.m4 2011-06-27 17:24:55 UTC (rev 312535) +++ php/php-src/branches/PHP_5_4/ext/dba/config.m4 2011-06-27 20:28:30 UTC (rev 312536) @@ -311,7 +311,7 @@ PHP_DBA_STD_BEGIN dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do + 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 @@ -320,6 +320,10 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/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 @@ -358,7 +362,7 @@ break fi done - PHP_DBA_DB_CHECK(4, 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-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)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) Modified: php/php-src/trunk/ext/dba/config.m4 =================================================================== --- php/php-src/trunk/ext/dba/config.m4 2011-06-27 17:24:55 UTC (rev 312535) +++ php/php-src/trunk/ext/dba/config.m4 2011-06-27 20:28:30 UTC (rev 312536) @@ -311,7 +311,7 @@ PHP_DBA_STD_BEGIN dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do + 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 @@ -320,6 +320,10 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/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 @@ -358,7 +362,7 @@ break fi done - PHP_DBA_DB_CHECK(4, 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-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)]) fi PHP_DBA_STD_RESULT(db4,Berkeley DB4)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php