rrichards Fri Jul 11 14:42:00 2008 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
MFB: fix iconv linking
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.29 php-src/ext/gd/config.w32:1.30
--- php-src/ext/gd/config.w32:1.29 Wed Jul 9 16:13:53 2008
+++ php-src/ext/gd/config.w32 Fri Jul 11 14:42:00 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
+// $Id: config.w32,v 1.30 2008/07/11 14:42:00 rrichards Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -8,12 +8,10 @@
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_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)
&&
- (((PHP_ZLIB=="no") && (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_LIB("iconv_a.lib", "gd", PHP_GD) ||
CHECK_LIB("iconv.lib", "gd", PHP_GD)) &&
+ (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) ||
CHECK_LIB("zlib.lib", "gd", PHP_GD))) ||
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd",
PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != "no") {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
