PHP mysqlnd svn commit: r840 - in trunk: php5/ext/mysqli php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-07-25 13:50:23 +0200 (Wed, 25 Jul 2007)
New Revision: 840

Modified:
   trunk/php5/ext/mysqli/config9.m4
   trunk/php6/ext/mysqli/config9.m4
Log:
Fixes from cvs.php.net


Modified: trunk/php5/ext/mysqli/config9.m4
===================================================================
--- trunk/php5/ext/mysqli/config9.m4	2007-07-24 19:12:36 UTC (rev 839)
+++ trunk/php5/ext/mysqli/config9.m4	2007-07-25 11:50:23 UTC (rev 840)
@@ -27,7 +27,7 @@
     AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
     MYSQL_LIB_CFG='--libmysqld-libs'
     dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
-    extra_sources="mysqli_embedded.c"
+    mysqli_extra_sources="mysqli_embedded.c"
   elif test "$enable_maintainer_zts" = "yes"; then
     MYSQL_LIB_CFG='--libs_r'
     MYSQL_LIB_NAME='mysqlclient_r'
@@ -61,14 +61,14 @@
     $MYSQLI_LIBLINE
   ])
 
-  extra_sources="$extra_sources mysqli_repl.c"
+  mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
 fi
 
 dnl Build extension
-if test -n "$extra_sources" || test "$PHP_MYSQLI" != "no"; then
+if test -n "$mysqli_extra_sources" || test "$PHP_MYSQLI" != "no"; then
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
-                  mysqli_exception.c $extra_sources"
+                  mysqli_exception.c $mysqli_extra_sources"
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)
 

Modified: trunk/php6/ext/mysqli/config9.m4
===================================================================
--- trunk/php6/ext/mysqli/config9.m4	2007-07-24 19:12:36 UTC (rev 839)
+++ trunk/php6/ext/mysqli/config9.m4	2007-07-25 11:50:23 UTC (rev 840)
@@ -3,7 +3,7 @@
 dnl config.m4 for extension mysqli
 
 PHP_ARG_WITH(mysqli, for MySQLi support,
-[  --with-mysqli[=FILE]    Include MySQLi support. FILE is the optional pathname to
mysql_config .
+[  --with-mysqli[=FILE]    Include MySQLi support. FILE is the optional pathname to
mysql_config [mysql_config].
                           If mysqlnd is passed as FILE, the MySQL native driver will be
used])
 
 PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
@@ -26,7 +26,7 @@
     AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
     MYSQL_LIB_CFG='--libmysqld-libs'
     dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
-    extra_sources="mysqli_embedded.c"
+    mysqli_extra_sources="mysqli_embedded.c"
   elif test "$enable_maintainer_zts" = "yes"; then
     MYSQL_LIB_CFG='--libs_r'
     MYSQL_LIB_NAME='mysqlclient_r'
@@ -60,14 +60,14 @@
     $MYSQLI_LIBLINE
   ])
 
-  extra_sources="$extra_sources mysqli_repl.c"
+  mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
 fi
 
 dnl Build extension
-if test -n "$extra_sources" || test "$PHP_MYSQLI" != "no"; then
+if test -n "$mysqli_extra_sources" || test "$PHP_MYSQLI" != "no"; then
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
-                  mysqli_exception.c $extra_sources"
+                  mysqli_exception.c $mysqli_extra_sources"
   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
   PHP_SUBST(MYSQLI_SHARED_LIBADD)