edink Sat Sep 3 17:33:05 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/gd config.w32
Log:
MFH: link zlib only if needed
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.5.2.2&r2=1.5.2.3&ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.5.2.2 php-src/ext/gd/config.w32:1.5.2.3
--- php-src/ext/gd/config.w32:1.5.2.2 Mon Apr 25 05:10:14 2005
+++ php-src/ext/gd/config.w32 Sat Sep 3 17:33:05 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5.2.2 2005/04/25 09:10:14 edink Exp $
+// $Id: config.w32,v 1.5.2.3 2005/09/03 21:33:05 edink Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -8,11 +8,14 @@
CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng.lib", "gd", PHP_GD) &&
CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
- CHECK_LIB("zlib.lib", "gd", PHP_GD + ";..\\zlib;" +
php_usual_lib_suspects) &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd") &&
CHECK_HEADER_ADD_INCLUDE("t1lib.h", "CFLAGS_GD", PHP_GD + ";" +
PHP_PHP_BUILD + "\\include\\t1lib")
) {
+ if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) {
+ CHECK_LIB("zlib.lib", "gd", PHP_GD + ";..\\zlib;" +
php_usual_lib_suspects);
+ }
+
EXTENSION("gd", "gd.c gdttf.c", null, "-Iext/gd/libgd",
"php_gd2.dll");
ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd_arc_f_buggy.c gd.c
\
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c
gdfontt.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
