Skip to content
Browse files

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fixed include checks for libpng under win
  • Loading branch information...
2 parents 60a2809 + 0165eec commit 45351eaab4d8f065c5948de5f28df975b36d592c @weltling weltling committed Oct 2, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 ext/gd/config.w32
View
3 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) )) ||

0 comments on commit 45351ea

Please sign in to comment.
Something went wrong with that request. Please try again.