]> git.kaiwu.me - nginx.git/commitdiff
Configure: added the NGX_ZLIB define.
authorValentin Bartenev <vbart@nginx.com>
Sun, 23 Dec 2012 16:04:14 +0000 (16:04 +0000)
committerValentin Bartenev <vbart@nginx.com>
Sun, 23 Dec 2012 16:04:14 +0000 (16:04 +0000)
This was introduced for conditional compilation of the code that requires
the zlib library.

auto/lib/zlib/conf

index cefc874b2228ca3ab06df3100a9c72449dfa9012..26db642ac903734f10198b46ec7632ceccac066a 100644 (file)
@@ -9,11 +9,13 @@ if [ $ZLIB != NONE ]; then
     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 @@ if [ $ZLIB != NONE ]; then
         ;;
 
         *)
+            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 @@ else
         # 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=