From: Pierre Joye <pajoye@php.net>
Date: Sun, 22 Jun 2008 21:55:59 +0000 (+0000)
Subject: - don't show zlib as available when libs or headers are missing
X-Git-Tag: php-5.3.0alpha1~647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7053732b6f921b659a101f62807ac867ae2eb3af;p=php

- don't show zlib as available when libs or headers are missing
---

diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32
index d5981a99ce..000b1ccabb 100644
--- a/ext/zlib/config.w32
+++ b/ext/zlib/config.w32
@@ -4,14 +4,19 @@
 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"
+	}
 }