diff options
| author | Anatol Belski <ab@php.net> | 2014-10-17 10:08:50 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-17 10:09:40 +0200 |
| commit | 1f6bd981433cdfc90238a95aa7339d72e7f2bc01 (patch) | |
| tree | 926cb0b8ec7405ce278ef189503ee9d260b2c83d | |
| parent | 35d703d00a5d434173424d563b3eb2c6213d5059 (diff) | |
| download | php-git-1f6bd981433cdfc90238a95aa7339d72e7f2bc01.tar.gz | |
check for zlib headers as well as lib for mysqlnd
| -rw-r--r-- | ext/mysqlnd/config.w32 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32 index c803042ee1..b13a81530a 100644 --- a/ext/mysqlnd/config.w32 +++ b/ext/mysqlnd/config.w32 @@ -26,8 +26,11 @@ if (PHP_MYSQLND != "no") { "mysqlnd_wireprotocol.c " + "php_mysqlnd.c "; EXTENSION("mysqlnd", mysqlnd_source, false); - if (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) || - (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) + if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "mysqlnd", PHP_MYSQLND))) || + (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND)) || + (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && + CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects) + ) { AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support"); AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support"); |