archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFH:- Fixed bug #41433 (DBA: configure fails to include correct db.h for db4)

Browse source
This commit is contained in:
Jani Taskinen 2007-07-19 10:50:16 +00:00
parent 7966ff120b
commit 09d9338040
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -143,6 +143,8 @@ PHP NEWS
non-existent file). (Tony) non-existent file). (Tony)
- Fixed bug #41445 (parse_ini_file() has a problem with certain types of - Fixed bug #41445 (parse_ini_file() has a problem with certain types of
integer as sections). (Tony) 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 - Fixed bug #41350 (my_thread_global_end() error during request shutdown
on Windows). (Scott, Andrey) on Windows). (Scott, Andrey)
- Fixed bug #41127 (Memory leak in ldap_{first|next}_attribute functions). - Fixed bug #41127 (Memory leak in ldap_{first|next}_attribute functions).

23
ext/dba/config.m4
View file

@ -196,6 +196,9 @@ PHP_DBA_STD_RESULT(ndbm)
dnl Berkeley specific (library and version test) dnl Berkeley specific (library and version test)
dnl parameters(version, library list, function) dnl parameters(version, library list, function)
AC_DEFUN([PHP_DBA_DB_CHECK],[ 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 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 if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
lib_found=""; lib_found="";
@ -223,11 +226,11 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
fi fi
done done
if test -z "$THIS_LIBS"; then if test -z "$THIS_LIBS"; then
AC_MSG_CHECKING(for db$1 major version) AC_MSG_CHECKING([for db$1 major version])
AC_MSG_ERROR(Header contains different version) AC_MSG_ERROR([Header contains different version])
fi fi
if test "$1" = "4"; then 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,[ AC_EGREP_CPP(yes,[
#include "$THIS_INCLUDE" #include "$THIS_INCLUDE"
#if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25 #if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25
@ -236,11 +239,11 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
],[ ],[
AC_MSG_RESULT(ok) 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 fi
if test "$ext_shared" = "yes"; then 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,[ AC_EGREP_CPP(yes,[
#include "$THIS_INCLUDE" #include "$THIS_INCLUDE"
#if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2) #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
@ -249,7 +252,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
],[ ],[
AC_MSG_RESULT(yes) 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 fi
if test -n "$THIS_LIBS"; then if test -n "$THIS_LIBS"; then
@ -257,12 +260,14 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
if test -n "$THIS_INCLUDE"; then if test -n "$THIS_INCLUDE"; then
AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE_UNQUOTED(DB$1_INCLUDE_FILE, "$THIS_INCLUDE", [ ])
fi fi
else
AC_MSG_ERROR([DBA: Could not find necessary library.])
fi fi
THIS_RESULT=yes
DB$1_LIBS=$THIS_LIBS DB$1_LIBS=$THIS_LIBS
DB$1_PREFIX=$THIS_PREFIX DB$1_PREFIX=$THIS_PREFIX
DB$1_INCLUDE=$THIS_INCLUDE DB$1_INCLUDE=$THIS_INCLUDE
PHP_DBA_STD_ASSIGN PHP_DBA_STD_ASSIGN
PHP_DBA_STD_CHECK
PHP_DBA_STD_ATTACH PHP_DBA_STD_ATTACH
]) ])
@ -274,6 +279,10 @@ if test "$PHP_DB4" != "no"; then
THIS_PREFIX=$i THIS_PREFIX=$i
THIS_INCLUDE=$i/db4/db.h THIS_INCLUDE=$i/db4/db.h
break 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 elif test -f "$i/include/db4/db.h"; then
THIS_PREFIX=$i THIS_PREFIX=$i
THIS_INCLUDE=$i/include/db4/db.h THIS_INCLUDE=$i/include/db4/db.h