diff options
| author | Andrey Hristov <andrey@php.net> | 2010-10-28 13:46:54 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-10-28 13:46:54 +0000 |
| commit | 099a505f896702c7698c83222c29544c79e16779 (patch) | |
| tree | a55014f88d85b0a1cbb7e6275221117be8a45baa /ext/mysqlnd/config9.m4 | |
| parent | e69b1ff2c43fbfd672097e9f8b25dead81f34ccf (diff) | |
| download | php-git-099a505f896702c7698c83222c29544c79e16779.tar.gz | |
fix windows debug build
better zlib detection
Diffstat (limited to 'ext/mysqlnd/config9.m4')
| -rw-r--r-- | ext/mysqlnd/config9.m4 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 2fcf336fc4..c6fbc915bb 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -27,13 +27,10 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then dnl Windows uses config.w32 thus this code is safe for now if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then - AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol support]) - if test "$PHP_ZLIB_DIR" != "no"; then + if test -z "$PHP_ZLIB_DIR"; then + AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol support]) PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD) MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" - else - PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD) - MYSQLND_LIBS="$MYSQLND_LIBS -lz" fi fi AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support]) |