summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-03-29 14:01:56 +0000
committerPierre Joye <pajoye@php.net>2009-03-29 14:01:56 +0000
commit1fcabf75fe6a473b0d5da05b201de46afca5c75a (patch)
tree37224e11b084e7879771f179c2b80671ed276d46
parentda141679cb38ef2d4bfb618bf4462b8205f4997f (diff)
downloadphp-git-1fcabf75fe6a473b0d5da05b201de46afca5c75a.tar.gz
- check in the libpng dir as well
-rw-r--r--ext/gd/config.w321
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 7a741f3bc2..57f88584a6 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,6 +9,7 @@ if (PHP_GD != "no") {
(CHECK_LIB("freetype_a.lib", "gd", PHP_GD) || CHECK_LIB("freetype2.lib", "gd", PHP_GD) ) &&
(CHECK_LIB("libpng_a.lib", "gd", PHP_GD) || CHECK_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_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ||
CHECK_LIB("iconv_a.lib", "gd", PHP_GD) || CHECK_LIB("iconv.lib", "gd", PHP_GD)) &&
CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) &&