diff options
| author | Jani Taskinen <jani@php.net> | 2007-11-06 10:00:39 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-11-06 10:00:39 +0000 |
| commit | 5cfa9c631261d968b6574a0707c5d80d8c419e0b (patch) | |
| tree | fbd0069809a0912f5266f051cc43a1bed6c202eb | |
| parent | a506a10cd6f6501357995bd84508111ff89a2ba2 (diff) | |
| download | php-git-5cfa9c631261d968b6574a0707c5d80d8c419e0b.tar.gz | |
MFH: partial MFH before?
| -rw-r--r-- | ext/mysql/config.m4 | 9 | ||||
| -rw-r--r-- | ext/mysqli/config.m4 | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index f5ed71c6c5..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. @@ -155,7 +156,7 @@ if test "$PHP_MYSQL" != "no"; then PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) PHP_SUBST(MYSQL_SHARED_LIBADD) - if test "$PHP_MYSQLI" = "mysqlnd"; then - PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) + if test "$PHP_MYSQL" = "mysqlnd"; then + PHP_ADD_EXTENSION_DEP(mysql, mysqlnd) fi fi 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 |