pajoye          Mon Apr  6 09:39:02 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/gd     config.w32 
  Log:
  - naming & cleanup
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.10&r2=1.10.4.4.2.11&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.10 
php-src/ext/gd/config.w32:1.10.4.4.2.11
--- php-src/ext/gd/config.w32:1.10.4.4.2.10     Sun Mar 29 14:01:56 2009
+++ php-src/ext/gd/config.w32   Mon Apr  6 09:39:02 2009
@@ -1,19 +1,18 @@
-// $Id: config.w32,v 1.10.4.4.2.10 2009/03/29 14:01:56 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.11 2009/04/06 09:39:02 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("gd", "Bundled GD support", "yes,shared");
 ARG_WITH("t1lib", "t1lib support", "yes");
 
 if (PHP_GD != "no") {
-       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) ) &&
+       if (CHECK_LIB("libjpeg_a.lib;libjpeg.lib", "gd", PHP_GD) &&
+               CHECK_LIB("freetype_a.lib;freetype.lib", "gd", PHP_GD) &&
+               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", "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)) &&
+               (CHECK_LIB("libiconv_a.lib;libiconv.llib", "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", "gd", PHP_GD) || 
CHECK_LIB("zlib.lib", "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)))
                ) {
                if (PHP_T1LIB != "no") {



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

Reply via email to