com php-src: enable ext/gd to support libpng16: ext/gd/config.w32

From: Date: Thu, 23 Jul 2015 14:10:07 +0000
Subject: com php-src: enable ext/gd to support libpng16: ext/gd/config.w32
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88136@lists.php.net to get a copy of this message
Commit: 084a6e43cd78546168133c066c236fc82c110a43 Author: Anatol Belski <ab@php.net> Thu, 23 Jul 2015 16:09:35 +0200 Parents: 9005b24aedfe4370f57bf73479052d8f733f7e2a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=084a6e43cd78546168133c066c236fc82c110a43 Log: enable ext/gd to support libpng16 Changed paths: M ext/gd/config.w32 Diff: diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index d9716ba..f0e0b22 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -11,7 +11,8 @@ if (PHP_GD != "no") { CHECK_HEADER_ADD_INCLUDE("ft2build.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include" + ";" + PHP_PHP_BUILD + "\\include\\freetype") && 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\\libpng15") || + (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng16") || + CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || 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) &&

« previous php.cvs (#88136) next »