wez Fri Nov 25 12:07:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql config.m4
Log:
fix configure
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.3&r2=1.25.2.4&ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.3
php-src/ext/pdo_mysql/config.m4:1.25.2.4
--- php-src/ext/pdo_mysql/config.m4:1.25.2.3 Thu Nov 24 13:56:16 2005
+++ php-src/ext/pdo_mysql/config.m4 Fri Nov 25 12:07:49 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.3 2005/11/24 18:56:16 wez Exp $
+dnl $Id: config.m4,v 1.25.2.4 2005/11/25 17:07:49 wez Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -85,13 +85,18 @@
AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
- _SAVE_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS $PDO_MYSQL_LIBS"
- AC_CHECK_FUNC(mysql_query,[],[
+ PHP_CHECK_LIBRARY(mysqlclient, mysql_query,
+ [
+ PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
+ ],[
AC_MSG_ERROR([mysql_query missing!?])
+ ],[
+ $PDO_MYSQL_LIBS
])
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $PDO_MYSQL_LIBS"
AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result
mysql_sqlstate])
- LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
ifdef([PHP_CHECK_PDO_INCLUDES],
[
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
