From: Pierre Joye <pajoye@php.net>
Date: Sun, 29 Mar 2009 14:01:15 +0000 (+0000)
Subject: - check in the libpng dir as well
X-Git-Tag: php-5.4.0alpha1~191^2~4028
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05f342c805dcad0ae0bab28e8d6951222b143bfd;p=php

- check in the libpng dir as well
---

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)) &&