diff options
| author | Gwynne Raskind <gwynne@php.net> | 2009-11-28 21:11:39 +0000 |
|---|---|---|
| committer | Gwynne Raskind <gwynne@php.net> | 2009-11-28 21:11:39 +0000 |
| commit | 8d169e42de8e53e263ff42c10b18d266d9e5dcc4 (patch) | |
| tree | e9f349d7ce2eed237b232363c9b96f1a38c5b9e0 | |
| parent | 21a6e1f96229b0168bc5169139a45b75e358925c (diff) | |
| download | php-git-8d169e42de8e53e263ff42c10b18d266d9e5dcc4.tar.gz | |
socket location needs to be checked before mysqlnd in order for --with-mysql-sock to work with mysqlnd
| -rw-r--r-- | ext/mysql/config.m4 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 8de15e8bbb..e7e73408a2 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -53,23 +53,24 @@ if test -z "$PHP_ZLIB_DIR"; then [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no) fi +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 + + if test "$PHP_MYSQL" = "mysqlnd"; then dnl enables build of mysqnd library 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= |