Mercurial > hg > nginx-quic
changeset 4987:66d001c5378c
Configure: added the NGX_ZLIB define.
This was introduced for conditional compilation of the code that requires
the zlib library.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Sun, 23 Dec 2012 16:04:14 +0000 |
parents | 3efc49b156d9 |
children | 3849bb380605 |
files | auto/lib/zlib/conf |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <zlib.h>" ngx_feature_path=