cvs: php-src(PHP_5_0) / NEWS /ext/odbc config.m4
| From: | Antony Dovgal | Date: | Mon, 04 Apr 2005 10:52:20 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/odbc config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31218@lists.php.net to get a copy of this message | ||
tony2001 Mon Apr 4 06:52:20 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/odbc config.m4
Log:
MFH: configure looks for incorrect db2 library
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.306&r2=1.1760.2.307&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.306 php-src/NEWS:1.1760.2.307
--- php-src/NEWS:1.1760.2.306 Sun Apr 3 17:57:04 2005
+++ php-src/NEWS Mon Apr 4 06:52:19 2005
@@ -1,11 +1,13 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2005, PHP 5.0.5
+- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string). (Ilia)
- Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
(kameshj at fastmail dot fm)
+
31 Mar 2005, PHP 5.0.4
- Added SNMPv2 support. (harrie)
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.65.2.2&r2=1.65.2.3&ty=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.65.2.2 php-src/ext/odbc/config.m4:1.65.2.3
--- php-src/ext/odbc/config.m4:1.65.2.2 Tue Jan 18 16:19:57 2005
+++ php-src/ext/odbc/config.m4 Mon Apr 4 06:52:19 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.65.2.2 2005/01/18 21:19:57 tony2001 Exp $
+dnl $Id: config.m4,v 1.65.2.3 2005/04/04 10:52:19 tony2001 Exp $
dnl
dnl
@@ -199,17 +199,23 @@
AC_MSG_ERROR([IBM DB2 header files not found])
fi
- if ! test -f "$ODBC_LIBDIR/libdb2.so"; then
- AC_MSG_ERROR([IBM DB2 required libraries not found])
- fi
-
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_TYPE=db2
ODBC_LIBS=-ldb2
- AC_DEFINE(HAVE_IBMDB2,1,[ ])
- AC_MSG_RESULT(yes)
+ PHP_TEST_BUILD(SQLExecute, [
+ AC_DEFINE(HAVE_IBMDB2,1,[ ])
+ AC_MSG_RESULT(yes)
+ ],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+ ],
+ [
+ $ODBC_LFLAGS $ODBC_LIBS
+ ])
+
else
AC_MSG_RESULT(no)
fi