diff options
| author | Jani Taskinen <jani@php.net> | 2009-11-29 18:08:38 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-11-29 18:08:38 +0000 |
| commit | f1ffc9b2e8d7375683dcc083d5c718cfd6a0517a (patch) | |
| tree | 40c21dd62cab7d47cabf498e368863966eb01f35 | |
| parent | 8b64f74baadd3f187e6c0fa0b1c57423da545a61 (diff) | |
| download | php-git-f1ffc9b2e8d7375683dcc083d5c718cfd6a0517a.tar.gz | |
- Revert bad patch
| -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 e7e73408a2..8de15e8bbb 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -53,24 +53,23 @@ 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= |