summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2009-03-29 14:01:15 +0000
committerPierre Joye <pajoye@php.net>2009-03-29 14:01:15 +0000
commit05f342c805dcad0ae0bab28e8d6951222b143bfd (patch)
tree9b3459283ead37ef864e8e082980e06ebb79b35f
parent0e72c2ee8fd40fe9f497f7a12781d5cdc04d7693 (diff)
downloadphp-git-05f342c805dcad0ae0bab28e8d6951222b143bfd.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 75d240c67e..107da49590 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -8,6 +8,7 @@ if (PHP_GD != "no") {
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
(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("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12") &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") &&
(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)) &&