pajoye          Sun Jun 22 21:55:59 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/zlib   config.w32 
  Log:
  - don't show zlib as available when libs or headers are missing
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/config.w32?r1=1.8.6.1&r2=1.8.6.2&diff_format=u
Index: php-src/ext/zlib/config.w32
diff -u php-src/ext/zlib/config.w32:1.8.6.1 php-src/ext/zlib/config.w32:1.8.6.2
--- php-src/ext/zlib/config.w32:1.8.6.1 Wed May 14 03:13:17 2008
+++ php-src/ext/zlib/config.w32 Sun Jun 22 21:55:59 2008
@@ -1,17 +1,22 @@
-// $Id: config.w32,v 1.8.6.1 2008/05/14 03:13:17 auroraeosrose Exp $
+// $Id: config.w32,v 1.8.6.2 2008/06/22 21:55:59 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

Reply via email to