From e90df45519dd259c263603f48fd6307760a9d7b9 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Sun, 23 Dec 2012 16:04:14 +0000 Subject: [PATCH] Configure: added the NGX_ZLIB define. This was introduced for conditional compilation of the code that requires the zlib library. --- auto/lib/zlib/conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index cefc874b2..26db642ac 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -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 " ngx_feature_path=