edink Sat Aug 6 18:20:06 2005 EDT
Modified files:
/php-src/ext/gd config.w32
Log:
Only link zlib if we dont compile it in (#3406)
http://cvs.php.net/diff.php/php-src/ext/gd/config.w32?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.8 php-src/ext/gd/config.w32:1.9
--- php-src/ext/gd/config.w32:1.8 Mon Aug 1 17:57:08 2005
+++ php-src/ext/gd/config.w32 Sat Aug 6 18:20:06 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2005/08/01 21:57:08 edink Exp $
+// $Id: config.w32,v 1.9 2005/08/06 22:20:06 edink Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -8,7 +8,6 @@
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
CHECK_LIB("freetype2.lib", "gd", PHP_GD) &&
CHECK_LIB("libpng.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")
) {
if (PHP_T1LIB != "no") {
@@ -21,6 +20,10 @@
}
}
+ if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) {
+ CHECK_LIB("zlib.lib", "gd", PHP_GD);
+ }
+
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
