com php-src: reverted the previous fix for libpng include: ext/gd/config.w32
| From: | Anatoliy Belsky | Date: | Tue, 02 Oct 2012 07:57:44 +0000 |
| Subject: | com php-src: reverted the previous fix for libpng include: ext/gd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70299@lists.php.net to get a copy of this message | ||
Commit: 92a46fe07e4407d52eb384c48aec5a3538731341
Author: Anatoliy Belsky <ab@php.net> Tue, 2 Oct 2012 09:57:44 +0200
Parents: 0165eec1ea63d4b4a063d68e7b78947f038d67ba
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=92a46fe07e4407d52eb384c48aec5a3538731341
Log:
reverted the previous fix for libpng include
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index af9aa83..8f1c13f 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,8 +9,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) )) ||