pajoye Wed Jul 2 20:52:35 2008 UTC
Modified files:
/php-src/ext/zlib config.w32
Log:
- MFB: does not enable zlib when a lib or header is missign
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/config.w32?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/config.w32:1.9 php-src/ext/zlib/config.w32:1.10
--- php-src/ext/zlib/config.w32:1.9 Wed May 14 03:32:27 2008
+++ php-src/ext/zlib/config.w32 Wed Jul 2 20:52:35 2008
@@ -1,17 +1,20 @@
-// $Id: config.w32,v 1.9 2008/05/14 03:32:27 auroraeosrose Exp $
+// $Id: config.w32,v 1.10 2008/07/02 20:52:35 pajoye Exp $
// vim:ft=javascript
ARG_ENABLE("zlib", "ZLIB support", "yes");
if (PHP_ZLIB == "yes") {
- EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", null,
"/D ZLIB_EXPORTS");
- AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
- CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB);
- CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" +
php_usual_include_suspects);
- if (!PHP_ZLIB_SHARED) {
- ADD_DEF_FILE("ext\\zlib\\php_zlib.def");
- }
-
-}
+ if (CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB) &&
+ CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" +
php_usual_include_suspects)) {
+ EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c",
null, "/D ZLIB_EXPORTS");
+ AC_DEFINE("HAVE_ZLIB", 1, "ZLIB support");
+ if (!PHP_ZLIB_SHARED) {
+ ADD_DEF_FILE("ext\\zlib\\php_zlib.def");
+ }
+ } else {
+ WARNING("zlib support can't be enabled, zlib is missing")
+ PHP_ZLIB = "no"
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
