pajoye Tue Jul 8 19:07:53 2008 UTC
Modified files:
/php-src/ext/gd config.w32
Log:
- use _a for static lib
- fix logic for shared zlib
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.27 php-src/ext/gd/config.w32:1.28
--- php-src/ext/gd/config.w32:1.27 Mon Jul 7 08:40:04 2008
+++ php-src/ext/gd/config.w32 Tue Jul 8 19:07:53 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27 2008/07/07 08:40:04 pajoye Exp $
+// $Id: config.w32,v 1.28 2008/07/08 19:07:53 pajoye Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -6,14 +6,14 @@
if (PHP_GD != "no") {
if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
- (CHECK_LIB("freetype.lib", "gd", PHP_GD) ||
CHECK_LIB("freetype2.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) ) &&
(CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) ||
CHECK_LIB("libiconv.lib", "gd", PHP_GD) ) &&
CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD +
";ext\\gd\\libgd") &&
(CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) ||
CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) ||
CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) ||
CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) &&
CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV)
&&
- ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD) ||
CHECK_LIB("zlib.lib", "gd", PHP_GD))
+ ((!PHP_ZLIB_SHARED) && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD)
|| CHECK_LIB("zlib.lib", "gd", PHP_GD)))
) {
if (PHP_T1LIB != "no") {
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
@@ -24,11 +24,6 @@
WARNING("t1lib not enabled; libraries and
headers not found");
}
}
-
- if (PHP_ZLIB == "no" || PHP_ZLIB_SHARED) {
- CHECK_LIB("zlib.lib", "gd", PHP_GD);
- }
-
CHECK_LIB("User32.lib", "gd", PHP_GD);
CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
