- Fixed bug #37363 (PDO_MYSQL does not build if no other mysql extension is

  enabled)

diff --git a/NEWS b/NEWS
index 4488d821564637cfe35f91458d836a76196edb58..b39e62032368533fca6c471ac1e0633788ed732c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -93,6 +93,8 @@ PHP                                                                        NEWS
   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)

diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4
index 8424199203ffb430a319c8788fbc46f6c75e0b6d..c2399442792ff220a7fe18bd0dceacde152b874a 100755 (executable)
--- a/ext/pdo_mysql/config.m4
+++ b/ext/pdo_mysql/config.m4
@@ -66,7 +66,7 @@ if test "$PHP_PDO_MYSQL" != "no"; then
       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 @@ if test "$PHP_PDO_MYSQL" != "no"; then
 
   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 @@ if test "$PHP_PDO_MYSQL" != "no"; then
   ],[
     $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 @@ if test "$PHP_PDO_MYSQL" != "no"; then
     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