Commit:    0165eec1ea63d4b4a063d68e7b78947f038d67ba
Author:    Anatoliy Belsky <a...@php.net>         Tue, 2 Oct 2012 09:39:34 +0200
Parents:   4f860a44126bf4cd87e7eb4eaa0ea4d44f96abc5
Branches:  PHP-5.3 PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=0165eec1ea63d4b4a063d68e7b78947f038d67ba

Log:
fixed include checks for libpng under win

Changed paths:
  M  ext/gd/config.w32


Diff:
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 8f1c13f..af9aa83 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -9,7 +9,8 @@ if (PHP_GD != "no") {
                CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
                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\\libpng12") &&
+               (CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng") ||
+               CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD +  ";" + 
PHP_PHP_BUILD + "\\include\\libpng12")) &&
                (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || 
CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) &&
                 CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 
                (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", 
PHP_GD) )) ||


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to