diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-02 10:00:09 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-02 10:00:09 +0200 |
| commit | 26e492f2f3d3e26f7320957172e37ee49f6e6112 (patch) | |
| tree | b3bf9d9d23dc26ce10deaeef2b93f1f24dd6f3eb | |
| parent | 45351eaab4d8f065c5948de5f28df975b36d592c (diff) | |
| parent | 92a46fe07e4407d52eb384c48aec5a3538731341 (diff) | |
| download | php-git-26e492f2f3d3e26f7320957172e37ee49f6e6112.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
reverted the previous fix for libpng include
| -rw-r--r-- | ext/gd/config.w32 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 838d90bc9b..38292d52f4 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -11,8 +11,7 @@ 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\\libpng") || - 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\\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) )) || |