- MFB: does not enable zlib when a lib or header is missign

diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32
index d5981a99ce478d6a72c08efa7514936c3357d421..4016246b0e9446def06160307babf487a753295f 100644 (file)
--- a/ext/zlib/config.w32
+++ b/ext/zlib/config.w32
@@ -4,14 +4,17 @@
 ARG_ENABLE("zlib", "ZLIB support", "yes");
 
 if (PHP_ZLIB == "yes") {
-       EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null, "/D ZLIB_EXPORTS");
-       AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
-       CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB);
-       CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects);
-       if (!PHP_ZLIB_SHARED) {
-               ADD_DEF_FILE("ext\\zlib\\php_zlib.def");
-       }
-
-}
+       if (CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB) &&
+               CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)) {
 
+               EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null, "/D ZLIB_EXPORTS");
+               AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
 
+               if (!PHP_ZLIB_SHARED) {
+                       ADD_DEF_FILE("ext\\zlib\\php_zlib.def");
+               }
+       } else {
+               WARNING("zlib support can't be enabled, zlib is missing")
+               PHP_ZLIB = "no"
+       }
+}