mike Thu Jun 1 15:14:45 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pdo_mysql config.m4
Log:
- Fixed bug #37363 (PDO_MYSQL does not build if no other mysql extension is
enabled)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.70&r2=1.2027.2.547.2.71&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.70 php-src/NEWS:1.2027.2.547.2.71
--- php-src/NEWS:1.2027.2.547.2.70 Wed May 31 23:06:50 2006
+++ php-src/NEWS Thu Jun 1 15:14:45 2006
@@ -93,6 +93,8 @@
request). (Tony)
- Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
- Fixed bug #37368 (Incorrect timestamp returned for strtotime()). (Derick)
+- Fixed bug #37363 (PDO_MYSQL does not build if no other mysql extension is
+ enabled). (Mike)
- Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
- Fixed bug #37341 ($_SERVER in included file is shortened to two entries,
if $_ENV gets used). (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7&r2=1.25.2.7.2.1&diff_format=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7
php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.1
--- php-src/ext/pdo_mysql/config.m4:1.25.2.7 Tue May 2 00:59:22 2006
+++ php-src/ext/pdo_mysql/config.m4 Thu Jun 1 15:14:45 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.7 2006/05/02 00:59:22 wez Exp $
+dnl $Id: config.m4,v 1.25.2.7.2.1 2006/06/01 15:14:45 mike Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -66,7 +66,7 @@
PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
else
PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
- fi
+ fi
if test -r $PDO_MYSQL_DIR/lib/mysql; then
PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib/mysql
else
@@ -87,9 +87,7 @@
AC_DEFINE_UNQUOTED(PDO_MYSQL_UNIX_ADDR, "$PDO_MYSQL_SOCKET", [ ])
-
- _SAVE_LIBS=$LIBS
- LIBS="$LIBS $PDO_MYSQL_LIBS"
+
PHP_CHECK_LIBRARY(mysqlclient, mysql_query,
[
PHP_EVAL_LIBLINE($PDO_MYSQL_LIBS, PDO_MYSQL_SHARED_LIBADD)
@@ -98,6 +96,8 @@
],[
$PDO_MYSQL_LIBS
])
+ _SAVE_LIBS=$LIBS
+ LIBS="$LIBS $PDO_MYSQL_LIBS"
AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare mysql_next_result
mysql_sqlstate])
LIBS=$_SAVE_LIBS
@@ -124,8 +124,7 @@
PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
])
PDO_MYSQL_MODULE_TYPE=external
-
- PDO_MYSQL_SHARED_LIBADD=$PDO_MYSQL_LIBS
+
PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
