Use pkg-config for SETUP_ZLIB_LIB()

Author: cmb69

ext/curl/config.w32

@@ -7,7 +7,7 @@ if (PHP_CURL != "no") {
 		SETUP_OPENSSL("curl", PHP_CURL) >= 2 &&
 		CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
 		CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
-		SETUP_ZLIB_LIB("curl", PHP_CURL) &&
+		SETUP_ZLIB_LIB("curl") &&
 		CHECK_LIB("normaliz.lib", "curl", PHP_CURL)
 	) {
 		PHP_EVAL_INCLINE(LIBCURL_CFLAGS, "curl");

ext/gd/config.w32

@@ -8,11 +8,11 @@ if (PHP_GD != "no") {
 	if (
 		PKG_CHECK_MODULES("GD", "libjpeg freetype libpng libiconv") &&
 		CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
-		SETUP_ZLIB_LIB("gd", PHP_GD) &&
-		CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)
-		) {
-			PHP_EVAL_INCLINE(GD_CFLAGS, "gd");
-			PHP_EVAL_LIBLINE(GD_LIBS, "gd");
+		SETUP_ZLIB_LIB("gd") && PKG_CHECK_MODULES("ZLIB", "zlib")
+	) {
+		PHP_EVAL_INCLINE(GD_CFLAGS, "gd");
+		PHP_EVAL_LIBLINE(GD_LIBS, "gd");
+		PHP_EVAL_INCLINE(ZLIB_CFLAGS);
 
 		if (PKG_CHECK_MODULES("LIBXPM", "libxpm")) {
 			PHP_EVAL_INCLINE(LIBXPM_CFLAGS, "gd");

ext/mysqlnd/config.w32

@@ -28,9 +28,8 @@ if (PHP_MYSQLND != "no") {
 			"mysqlnd_wireprotocol.c " +
 			"php_mysqlnd.c ";
 		EXTENSION("mysqlnd", mysqlnd_source, false, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
-		if (SETUP_ZLIB_LIB("mysqlnd", PHP_MYSQLND) &&
-			CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)
-		) {
+		if (SETUP_ZLIB_LIB("mysqlnd") && PKG_CHECK_MODULES("ZLIB", "zlib")) {
+			PHP_EVAL_INCLINE(ZLIB_CFLAGS);
 			AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
 			AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "Define to 1 if mysqlnd core SSL is enabled.");
 			if (CHECK_LIB("crypt32.lib", "mysqlnd")) {

win32/build/confutils.js

@@ -3684,7 +3684,14 @@ function ADD_MAKEFILE_FRAGMENT(src_file)
 
 function SETUP_ZLIB_LIB(target, path_to_check)
 {
-	return (PHP_ZLIB != "no" && !PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check);
+	var pcm;
+	if ((PHP_ZLIB != "no" && !PHP_ZLIB_SHARED) || (pcm = PKG_CHECK_MODULES("ZLIB", "zlib"))) {
+		if (pcm) {
+			PHP_EVAL_LIBLINE(ZLIB_CFLAGS, target);
+		}
+		return true;
+	}
+	return false;
 }
 
 function SETUP_OPENSSL(target)