pajoye Sun Jul 6 16:59:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/iconv config.w32 Log: - MFH: update lib detection and does not enable it when lib/headers are missing http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/config.w32?r1=1.6&r2=1.6.6.1&diff_format=u Index: php-src/ext/iconv/config.w32 diff -u php-src/ext/iconv/config.w32:1.6 php-src/ext/iconv/config.w32:1.6.6.1 --- php-src/ext/iconv/config.w32:1.6 Tue Nov 23 12:04:07 2004 +++ php-src/ext/iconv/config.w32 Sun Jul 6 16:59:13 2008 @@ -1,11 +1,13 @@ -// $Id: config.w32,v 1.6 2004/11/23 12:04:07 edink Exp $ +// $Id: config.w32,v 1.6.6.1 2008/07/06 16:59:13 pajoye Exp $ // vim: ft=javascript ARG_WITH("iconv", "iconv support", "yes"); if (PHP_ICONV != "no") { - if (/*CHECK_LIB("iconv.lib", "iconv", PHP_ICONV) &&*/ - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)) { + if ((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)) { + EXTENSION("iconv", "iconv.c"); AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled"); @@ -16,6 +18,9 @@ if (!PHP_ICONV_SHARED) { ADD_DEF_FILE("ext\\iconv\\php_iconv.def"); } + } else { + WARNING("iconv support can't be enabled, libraries or headers are missing") + PHP_ICONV = "no"; } }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php