com php-src: fix include search: ext/gd/config.w32
| From: | Anatol Belski | Date: | Wed, 12 Mar 2014 18:25:20 +0000 |
| Subject: | com php-src: fix include search: ext/gd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76471@lists.php.net to get a copy of this message | ||
Commit: 75486555c2b0a28b9b3fe131231f3e8549f1f9ef
Author: Anatol Belski <ab@php.net> Wed, 12 Mar 2014 19:25:20 +0100
Parents: 78cee12561ed0e405f3d6f36623d5045920c8bf3
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75486555c2b0a28b9b3fe131231f3e8549f1f9ef
Log:
fix include search
Changed paths:
M ext/gd/config.w32
Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 1420b11..2127fc5 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,6 +9,7 @@ if (PHP_GD != "no") {
if (
CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
+ 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") ||