check for zlib headers as well as lib for mysqlnd

diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index c803042ee10a1a761042ab65082526fe1595b3c7..b13a81530abc98bbbe3347450220bf6c6823a9e0 100644 (file)
--- 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");