From: Anatol Belski <ab@php.net>
Date: Tue, 4 Apr 2017 14:32:29 +0000 (+0200)
Subject: external libzip neither requires zlib.h nor lib
X-Git-Tag: php-7.2.0alpha1~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c750d91ee9eeba00563a7a2d94a7470406b1b7e;p=php

external libzip neither requires zlib.h nor lib
---

diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 18bad33c79..4a4107535d 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -4,10 +4,9 @@
 ARG_ENABLE("zip", "ZIP support", "yes");
 
 if (PHP_ZIP != "no") {
-	if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" + PHP_ZIP) &&
-		CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) &&
+	if (CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) &&
 		CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP) &&
-		(CHECK_LIB("zlib_a.lib;zlib.lib", "zip", PHP_ZIP) && (PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP)))
+		(PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP))
 	) {
 		EXTENSION('zip', 'php_zip.c zip_stream.c');