rrichards Wed Jul 9 16:13:53 2008 UTC
Modified files:
/php-src/ext/gd config.w32
/php-src/ext/zip config.w32
Log:
MFB: fix zlib detection and linking
- synch zip config.w32
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.28 php-src/ext/gd/config.w32:1.29
--- php-src/ext/gd/config.w32:1.28 Tue Jul 8 19:07:53 2008
+++ php-src/ext/gd/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.28 2008/07/08 19:07:53 pajoye Exp $
+// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
ARG_WITH("gd", "Bundled GD support", "yes,shared");
@@ -13,7 +13,8 @@
(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=="no") && (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) ||
CHECK_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") {
if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) &&
@@ -24,6 +25,7 @@
WARNING("t1lib not enabled; libraries and
headers not found");
}
}
+
CHECK_LIB("User32.lib", "gd", PHP_GD);
CHECK_LIB("Gdi32.lib", "gd", PHP_GD);
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.4 php-src/ext/zip/config.w32:1.5
--- php-src/ext/zip/config.w32:1.4 Mon Jan 14 03:15:50 2008
+++ php-src/ext/zip/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,14 +1,13 @@
-// $Id: config.w32,v 1.4 2008/01/14 03:15:50 cellog Exp $
+// $Id: config.w32,v 1.5 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
-ARG_ENABLE("zip", "ZIP support", "no");
+ARG_ENABLE("zip", "ZIP support", "yes");
if (PHP_ZIP != "no") {
-
- if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" +
php_usual_include_suspects + ";" + PHP_ZIP)) {
- if (PHP_ZLIB_SHARED) {
- CHECK_LIB("zlib.lib", "zip", PHP_ZIP);
- }
+ if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" +
PHP_ZIP) &&
+ (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP)
|| CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip",
PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ ) {
EXTENSION('zip', 'php_zip.c zip_stream.c');
ADD_SOURCES(configure_module_dirname + "/lib", "zip_add.c
zip_error.c zip_fclose.c \
zip_fread.c zip_open.c zip_source_filep.c \
@@ -29,9 +28,7 @@
zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c",
"zip");
- AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
- ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS ");
} else {
WARNING("zip not enabled; libraries and headers not found");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
