backport gd config.w32 to support freetype 2.5

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 1420b11e6e951a8af7e96c2e5cb8b8aefb5013d2..2127fc5dcee819d60379a97a8a47fb77a27213e4 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,6 +9,7 @@ if (PHP_GD != "no") {
        if (
                CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
                CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
+               CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include" + ";" + PHP_PHP_BUILD + "\\include\\freetype") &&
                CHECK_LIB("libpng_a.lib;libpng.lib", "gd", PHP_GD) &&
                CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
                (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng15") ||