Merge branch 'PHP-5.4'

* PHP-5.4: fixed include checks for libpng under win
php · Oct 2, 2012 · 6d1f81ebc0e0407204f16f8f8e24bad50e25c0ba · 6d1f81e
2 parents 62fa875 + 45351ea
commit 6d1f81ebc0e0407204f16f8f8e24bad50e25c0ba
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 ext/gd/config.w32
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
@@ -11,7 +11,8 @@ if (PHP_GD != "no") {
 		CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
 		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\\libpng12") &&
+		(CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng") ||
+		CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + PHP_PHP_BUILD + "\\include\\libpng12")) &&
 		(CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
 		 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
 		(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) ||