diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-02 09:40:42 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-02 09:40:42 +0200 |
| commit | 45351eaab4d8f065c5948de5f28df975b36d592c (patch) | |
| tree | c725a8b87a766db7360bc6e94ef15c1158c8ab79 | |
| parent | 60a280936e52b3ab20f0ece06e80088a5bd8fd0c (diff) | |
| parent | 0165eec1ea63d4b4a063d68e7b78947f038d67ba (diff) | |
| download | php-git-45351eaab4d8f065c5948de5f28df975b36d592c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed include checks for libpng under win
| -rw-r--r-- | ext/gd/config.w32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 38292d52f4..838d90bc9b 100644 --- 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) )) || |