From: Pierre Joye Date: Mon, 28 Jun 2010 23:26:48 +0000 (+0000) Subject: - typo for iconv DLL .lib X-Git-Tag: php-5.4.0alpha1~191^2~1234 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f62f88cb762a90e3c9fe37b6d6f5dbf086bc8f9e;p=php - typo for iconv DLL .lib --- diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 47d22f983d..340424b6bf 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -10,7 +10,7 @@ if (PHP_GD != "no") { 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_LIB("libiconv_a.lib;libiconv.llib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && + (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_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))