tony2001 Tue Jul 24 20:11:13 2007 UTC
Modified files:
/php-src/ext/mysqli config9.m4
Log:
namespace protection
GD uses the same variable, too.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config9.m4?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/config9.m4
diff -u php-src/ext/mysqli/config9.m4:1.2 php-src/ext/mysqli/config9.m4:1.3
--- php-src/ext/mysqli/config9.m4:1.2 Tue Jul 24 19:20:28 2007
+++ php-src/ext/mysqli/config9.m4 Tue Jul 24 20:11:13 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.2 2007/07/24 19:20:28 andrey Exp $
+dnl $Id: config9.m4,v 1.3 2007/07/24 20:11:13 tony2001 Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
