jani Thu Jul 19 10:50:16 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/dba config.m4 Log: MFH:- Fixed bug #41433 (DBA: configure fails to include correct db.h for db4) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.839&r2=1.2027.2.547.2.840&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.839 php-src/NEWS:1.2027.2.547.2.840 --- php-src/NEWS:1.2027.2.547.2.839 Wed Jul 18 18:06:55 2007 +++ php-src/NEWS Thu Jul 19 10:50:16 2007 @@ -143,6 +143,8 @@ non-existent file). (Tony) - Fixed bug #41445 (parse_ini_file() has a problem with certain types of integer as sections). (Tony) +- Fixed bug #41433 (DBA: configure fails to include correct db.h for db4). + (Jani) - Fixed bug #41350 (my_thread_global_end() error during request shutdown on Windows). (Scott, Andrey) - Fixed bug #41127 (Memory leak in ldap_{first|next}_attribute functions). http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2.2.7&r2=1.70.2.2.2.8&diff_format=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.70.2.2.2.7 php-src/ext/dba/config.m4:1.70.2.2.2.8 --- php-src/ext/dba/config.m4:1.70.2.2.2.7 Fri Jul 13 15:09:19 2007 +++ php-src/ext/dba/config.m4 Thu Jul 19 10:50:16 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70.2.2.2.7 2007/07/13 15:09:19 jani Exp $ +dnl $Id: config.m4,v 1.70.2.2.2.8 2007/07/19 10:50:16 jani Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -196,6 +196,9 @@ dnl Berkeley specific (library and version test) dnl parameters(version, library list, function) AC_DEFUN([PHP_DBA_DB_CHECK],[ + if test -z "$THIS_INCLUDE"; then + AC_MSG_ERROR([DBA: Could not find necessary header file(s).]) + fi for LIB in $2; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then lib_found=""; @@ -223,11 +226,11 @@ fi done if test -z "$THIS_LIBS"; then - AC_MSG_CHECKING(for db$1 major version) - AC_MSG_ERROR(Header contains different version) + AC_MSG_CHECKING([for db$1 major version]) + AC_MSG_ERROR([Header contains different version]) fi if test "$1" = "4"; then - AC_MSG_CHECKING(for db4 minor version and patch level) + AC_MSG_CHECKING([for db4 minor version and patch level]) AC_EGREP_CPP(yes,[ #include "$THIS_INCLUDE" #if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25 @@ -236,11 +239,11 @@ ],[ AC_MSG_RESULT(ok) ],[ - AC_MSG_ERROR(Version 4.1 requires patch level 25) + AC_MSG_ERROR([Version 4.1 requires patch level 25]) ]) fi if test "$ext_shared" = "yes"; then - AC_MSG_CHECKING(if dba can be used as shared extension) + AC_MSG_CHECKING([if dba can be used as shared extension]) AC_EGREP_CPP(yes,[ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) @@ -249,7 +252,7 @@ ],[ AC_MSG_RESULT(yes) ],[ - AC_MSG_ERROR(At least version 3.3 is required) + AC_MSG_ERROR([At least version 3.3 is required]) ]) fi if test -n "$THIS_LIBS"; then @@ -257,12 +260,14 @@ if test -n "$THIS_INCLUDE"; then AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) fi + else + AC_MSG_ERROR([DBA: Could not find necessary library.]) fi + THIS_RESULT=yes DB$1_LIBS=$THIS_LIBS DB$1_PREFIX=$THIS_PREFIX DB$1_INCLUDE=$THIS_INCLUDE PHP_DBA_STD_ASSIGN - PHP_DBA_STD_CHECK PHP_DBA_STD_ATTACH ]) @@ -274,6 +279,10 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break + elif test -f "$i/include/db4.5/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db4.5/db.h + break elif test -f "$i/include/db4/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db4/db.h
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php