]> granicus.if.org Git - php/commitdiff
- check in the libpng dir as well
authorPierre Joye <pajoye@php.net>
Sun, 29 Mar 2009 14:01:56 +0000 (14:01 +0000)
committerPierre Joye <pajoye@php.net>
Sun, 29 Mar 2009 14:01:56 +0000 (14:01 +0000)
ext/gd/config.w32

index 7a741f3bc2484097292fe52a3bff3fb956a5a6ac..57f88584a61b071cf6b9cf5643de1e2c1b12cf61 100644 (file)
@@ -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) &&