diff options
| author | Jani Taskinen <jani@php.net> | 2007-07-27 01:09:18 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-07-27 01:09:18 +0000 |
| commit | 6287087e7043aaf050828c72bde23009af345e85 (patch) | |
| tree | 9c19d059762e6ae8104d46339cd921cd4688d2fe | |
| parent | 452ace5e145775d5b74854dd0df2a323c27aa7fe (diff) | |
| download | php-git-6287087e7043aaf050828c72bde23009af345e85.tar.gz | |
- Align help texts and added note about embedded not being available when
the MySQL native driver is used.
| -rw-r--r-- | ext/mysql/config.m4 | 5 | ||||
| -rw-r--r-- | ext/mysqli/config.m4 | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index eac5836e03..08e9ebbd2e 100644 --- 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 7302e66c42..df4e1650df 100644 --- 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 |