jani Fri Jul 27 01:09:18 2007 UTC
Modified files:
/php-src/ext/mysql config.m4
/php-src/ext/mysqli config.m4
Log:
- Align help texts and added note about embedded not being available when
the MySQL native driver is used.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.m4?r1=1.72&r2=1.73&diff_format=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.72 php-src/ext/mysql/config.m4:1.73
--- php-src/ext/mysql/config.m4:1.72 Thu Jul 26 19:07:53 2007
+++ php-src/ext/mysql/config.m4 Fri Jul 27 01:09:17 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.72 2007/07/26 19:07:53 jani Exp $
+dnl $Id: config.m4,v 1.73 2007/07/27 01:09:17 jani Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -40,8 +40,9 @@
PHP_ARG_WITH(mysql, for MySQL support,
-[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base
directory.
- If mysqlnd is passed as DIR, the MySQL native
driver will be used])
+[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base
+ directory. If mysqlnd is passed as DIR,
+ the MySQL native driver will be used [/usr/local]])
PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
[ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.m4?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.28 php-src/ext/mysqli/config.m4:1.29
--- php-src/ext/mysqli/config.m4:1.28 Wed Jul 25 23:47:32 2007
+++ php-src/ext/mysqli/config.m4 Fri Jul 27 01:09:18 2007
@@ -1,13 +1,15 @@
dnl
-dnl $Id: config.m4,v 1.28 2007/07/25 23:47:32 jani Exp $
+dnl $Id: config.m4,v 1.29 2007/07/27 01:09:18 jani Exp $
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 [mysql_config].
- If mysqlnd is passed as FILE, the MySQL native
driver will be used])
+[ --with-mysqli[=FILE] Include MySQLi support. FILE is the path
+ to mysql_config. If mysqlnd is passed as FILE,
+ the MySQL native driver will be used [mysql_config]])
PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
-[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no)
+[ --enable-embedded-mysqli MYSQLi: Enable embedded support
+ Note: Does not work with MySQL native driver!],
no, no)
if test "$PHP_MYSQLI" = "mysqlnd"; then
dnl This needs to be set in any extension which wishes to use mysqlnd
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
