diff options
Diffstat (limited to 'ext/mysqli/config.m4')
| -rw-r--r-- | ext/mysqli/config.m4 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/ext/mysqli/config.m4 b/ext/mysqli/config.m4 index 409d7d0d8..400d7febd 100644 --- a/ext/mysqli/config.m4 +++ b/ext/mysqli/config.m4 @@ -1,27 +1,23 @@ dnl -dnl $Id: config.m4 302549 2010-08-20 12:25:17Z andrey $ +dnl $Id: config.m4 316350 2011-09-07 13:33:56Z johannes $ dnl config.m4 for extension mysqli PHP_ARG_WITH(mysqli, for MySQLi support, [ --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]]) + to mysql_config. If no value or mysqlnd is passed + as FILE, the MySQL native driver will be used]) PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, [ --enable-embedded-mysqli MYSQLi: Enable embedded support Note: Does not work with MySQL native driver!], no, no) -if test "$PHP_MYSQLI" = "mysqlnd"; then +if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then dnl This needs to be set in any extension which wishes to use mysqlnd PHP_MYSQLND_ENABLED=yes elif test "$PHP_MYSQLI" != "no"; then - if test "$PHP_MYSQLI" = "yes"; then - MYSQL_CONFIG=`$php_shtool path mysql_config` - else - MYSQL_CONFIG=$PHP_MYSQLI - fi + MYSQL_CONFIG=$PHP_MYSQLI MYSQL_LIB_NAME='mysqlclient' if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then @@ -77,12 +73,12 @@ dnl Build extension if test "$PHP_MYSQLI" != "no"; then mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ - mysqli_exception.c $mysqli_extra_sources" + mysqli_exception.c mysqli_result_iterator.c $mysqli_extra_sources" PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared) PHP_SUBST(MYSQLI_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h]) - if test "$PHP_MYSQLI" = "mysqlnd"; then + if test "$PHP_MYSQLI" = "yes" || test "$PHP_MYSQLI" = "mysqlnd"; then PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled]) fi |