cvs: php-src /ext/odbc config.m4
| From: | Antony Dovgal | Date: | Mon, 04 Apr 2005 10:50:36 +0000 |
| Subject: | cvs: php-src /ext/odbc config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31217@lists.php.net to get a copy of this message | ||
tony2001 Mon Apr 4 06:50:36 2005 EDT
Modified files:
/php-src/ext/odbc config.m4
Log:
fix #32560 (configure looks for incorrect library - libdb2.so instead of libdb2.a,
which is used actually)
http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.69&r2=1.70&ty=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.69 php-src/ext/odbc/config.m4:1.70
--- php-src/ext/odbc/config.m4:1.69 Tue Jan 18 16:16:32 2005
+++ php-src/ext/odbc/config.m4 Mon Apr 4 06:50:32 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.69 2005/01/18 21:16:32 tony2001 Exp $
+dnl $Id: config.m4,v 1.70 2005/04/04 10:50:32 tony2001 Exp $
dnl
dnl
@@ -198,18 +198,24 @@
if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
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