- Align help texts and added note about embedded not being available when

  the MySQL native driver is used.

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index eac5836e03122583a5a4c618ecb813cc244d1f96..08e9ebbd2ed1aa6e1e608e95581ace11c1d1c714 100644 (file)
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -40,8 +40,9 @@ AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
 
 
 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.

diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4
index 7302e66c42b6f2bf02c96162f74c434eacb76825..df4e1650df09d3e85cb460f19cd46f42b1dc3d62 100644 (file)
--- a/ext/mysqli/config.m4
+++ b/ext/mysqli/config.m4
@@ -3,11 +3,13 @@ dnl $Id$
 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