pajoye                                   Mon, 28 Jun 2010 23:26:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300833

Log:
- typo for iconv DLL .lib

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/gd/config.w32
    U   php/php-src/trunk/ext/gd/config.w32

Modified: php/php-src/branches/PHP_5_3/ext/gd/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/config.w32      2010-06-28 23:09:28 UTC 
(rev 300832)
+++ php/php-src/branches/PHP_5_3/ext/gd/config.w32      2010-06-28 23:26:48 UTC 
(rev 300833)
@@ -10,7 +10,7 @@
                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)))

Modified: php/php-src/trunk/ext/gd/config.w32
===================================================================
--- php/php-src/trunk/ext/gd/config.w32 2010-06-28 23:09:28 UTC (rev 300832)
+++ php/php-src/trunk/ext/gd/config.w32 2010-06-28 23:26:48 UTC (rev 300833)
@@ -10,7 +10,7 @@
                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)))

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

Reply via email to