[nginx] svn commit: r4988 - trunk/auto/lib/zlib

[vbart at nginx.com]

Author: vbart
Date: 2012-12-23 16:04:14 +0000 (Sun, 23 Dec 2012)
New Revision: 4988
URL: http://trac.nginx.org/nginx/changeset/4988/nginx

Log:
Configure: added the NGX_ZLIB define.

This was introduced for conditional compilation of the code that requires
the zlib library.



Modified:
   trunk/auto/lib/zlib/conf

Modified: trunk/auto/lib/zlib/conf
===================================================================
--- trunk/auto/lib/zlib/conf	2012-12-23 15:51:47 UTC (rev 4987)
+++ trunk/auto/lib/zlib/conf	2012-12-23 16:04:14 UTC (rev 4988)
@@ -9,11 +9,13 @@
     case "$NGX_CC_NAME" in
 
         msvc* | owc* | bcc)
+            have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
             CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
         ;;
 
         icc*)
+            have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
 
             # to allow -ipo optimization we link with the *.o but not library
@@ -30,6 +32,7 @@
         ;;
 
         *)
+            have=NGX_ZLIB . auto/have
             LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
             CORE_LIBS="$CORE_LIBS $ZLIB/libz.a"
             #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
@@ -45,7 +48,7 @@
         # FreeBSD, Solaris, Linux
 
         ngx_feature="zlib library"
-        ngx_feature_name=
+        ngx_feature_name="NGX_ZLIB"
         ngx_feature_run=no
         ngx_feature_incs="#include <zlib.h>"
         ngx_feature_path=