pajoye Mon Jul 7 08:41:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd config.w32 Log: - test for ZLIB_SHARED (possible conflict) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.1&r2=1.10.4.4.2.2&diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.10.4.4.2.1 php-src/ext/gd/config.w32:1.10.4.4.2.2 --- php-src/ext/gd/config.w32:1.10.4.4.2.1 Sun Jul 6 17:07:26 2008 +++ php-src/ext/gd/config.w32 Mon Jul 7 08:41:10 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.10.4.4.2.1 2008/07/06 17:07:26 pajoye Exp $ +// $Id: config.w32,v 1.10.4.4.2.2 2008/07/07 08:41:10 pajoye Exp $ // vim:ft=javascript ARG_WITH("gd", "Bundled GD support", "yes,shared"); @@ -8,12 +8,12 @@ if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) && (CHECK_LIB("freetype.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_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD) ) && (CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ) && CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && (CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) && - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) && + ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD)) ) { if (PHP_T1LIB != "no") { if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) && @@ -25,10 +25,6 @@ } } - if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) { - CHECK_LIB("zlib.lib", "gd", PHP_GD); - } - CHECK_LIB("User32.lib", "gd", PHP_GD); CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php