pajoye          Sun Mar 29 14:01:56 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/gd     config.w32 
  Log:
  - check in the libpng dir as well
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.9&r2=1.10.4.4.2.10&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.9 
php-src/ext/gd/config.w32:1.10.4.4.2.10
--- php-src/ext/gd/config.w32:1.10.4.4.2.9      Wed Jan 14 19:06:01 2009
+++ php-src/ext/gd/config.w32   Sun Mar 29 14:01:56 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.9 2009/01/14 19:06:01 tabe Exp $
+// $Id: config.w32,v 1.10.4.4.2.10 2009/03/29 14:01:56 pajoye Exp $
 // vim:ft=javascript
 
 ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -9,6 +9,7 @@
                (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_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_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && 



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

Reply via email to