diff options
| author | Jani Taskinen <jani@php.net> | 2009-11-30 15:11:29 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-11-30 15:11:29 +0000 |
| commit | c1aa547b18c48861a20f222604ac65d28bcc6248 (patch) | |
| tree | ab679fefc8d959c48b2819eef67aad89278f3ddd /ext/mysql/config.m4 | |
| parent | b26c9d400dd5e08173daa7a72edbeb979fe58b15 (diff) | |
| download | php-git-c1aa547b18c48861a20f222604ac65d28bcc6248.tar.gz | |
- Fixed bug #50231 (Socket path passed using --with-mysql-sock is ignored when mysqlnd is enabled)
Diffstat (limited to 'ext/mysql/config.m4')
| -rw-r--r-- | ext/mysql/config.m4 | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 8de15e8bbb..2babcee827 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -58,18 +58,6 @@ if test "$PHP_MYSQL" = "mysqlnd"; then PHP_MYSQLND_ENABLED=yes elif test "$PHP_MYSQL" != "no"; then - - AC_MSG_CHECKING([for MySQL UNIX socket location]) - if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then - MYSQL_SOCK=$PHP_MYSQL_SOCK - AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ]) - AC_MSG_RESULT([$MYSQL_SOCK]) - elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then - PHP_MYSQL_SOCKET_SEARCH - else - AC_MSG_RESULT([no]) - fi - MYSQL_DIR= MYSQL_INC_DIR= @@ -152,6 +140,17 @@ fi dnl Enable extension if test "$PHP_MYSQL" != "no"; then + AC_MSG_CHECKING([for MySQL UNIX socket location]) + if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then + MYSQL_SOCK=$PHP_MYSQL_SOCK + AC_DEFINE_UNQUOTED(PHP_MYSQL_UNIX_SOCK_ADDR, "$MYSQL_SOCK", [ ]) + AC_MSG_RESULT([$MYSQL_SOCK]) + elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then + PHP_MYSQL_SOCKET_SEARCH + else + AC_MSG_RESULT([no]) + fi + AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) PHP_SUBST(MYSQL_SHARED_LIBADD) |