sniper Fri Oct 31 08:48:35 2003 EDT
Modified files:
/php-src/ext/mysqli config.m4
Log:
cosmetics
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.8 php-src/ext/mysqli/config.m4:1.9
--- php-src/ext/mysqli/config.m4:1.8 Wed Oct 29 15:48:47 2003
+++ php-src/ext/mysqli/config.m4 Fri Oct 31 08:48:34 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2003/10/29 20:48:47 georg Exp $
+dnl $Id: config.m4,v 1.9 2003/10/31 13:48:34 sniper Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -7,10 +7,11 @@
pathname to mysql_config.])
PHP_ARG_WITH(embedded_mysqli, for embedded MySQLi support,
-[ --with-embedded-mysqli[=FILE] Include embedded MySQLi support. FILE is the
optional
+[ --with-embedded-mysqli[=FILE]
+ Include embedded MySQLi support. FILE is the optional
pathname to mysql_config.])
-if test "$PHP_MYSQLI" != "no" '-o' "$PHP_EMBEDDED_MYSQLI" != "no"; then
+if test "$PHP_MYSQLI" != "no" || test "$PHP_EMBEDDED_MYSQLI" != "no"; then
if test "$PHP_MYSQL" = "yes"; then
AC_MSG_ERROR([--with-mysql (using bundled libs) can not be used together with
--with-mysqli.])
@@ -29,7 +30,7 @@
if test "$PHP_MYSQLI" != "no"; then
MYSQL_LIB_CFG='--libs'
else
- AC_DEFINE([HAVE_EMBEDDED_MYSQLI],[1], [embedded MySQL support enabled])
+ AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
MYSQL_LIB_CFG='--libmysqld-libs'
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
