- check in the libpng dir as well

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 75d240c67ef32039766f7234bb243b53ff5d9dfb..107da495909d36b5c924a56fd5837353f95506f7 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -8,6 +8,7 @@ if (PHP_GD != "no") {
        if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
                (CHECK_LIB("freetype_a.lib", "gd", PHP_GD) || CHECK_LIB("freetype2.lib", "gd", PHP_GD) ) &&
                (CHECK_LIB("libpng_a.lib", "gd", PHP_GD) || CHECK_LIB("libpng.lib", "gd", PHP_GD) ) &&
+               CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng12") &&
                CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
                (CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ||
                 CHECK_LIB("iconv_a.lib", "gd", PHP_GD) || CHECK_LIB("iconv.lib", "gd", PHP_GD)) &&