Only link zlib if we dont compile it in (#3406)

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 4b2a5c7a4eea264bf0e6792d1b8f8123b8945090..4f82943ff51b02011b36b45629e8259e44137282 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -8,7 +8,6 @@ if (PHP_GD != "no") {
        if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
                CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
                CHECK_LIB("libpng.lib", "gd", PHP_GD) &&
-               CHECK_LIB("zlib.lib", "gd", PHP_GD + ";..\\zlib;" + php_usual_lib_suspects) &&
                CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd")
                ) {
                if (PHP_T1LIB != "no") {
@@ -21,6 +20,10 @@ if (PHP_GD != "no") {
                        }
                }
 
+               if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) {
+                       CHECK_LIB("zlib.lib", "gd", PHP_GD);
+               }
+
                EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd", "php_gd2.dll");
                ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c \
                        gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \