diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2012-12-23 16:04:14 +0000 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2012-12-23 16:04:14 +0000 |
| commit | e90df45519dd259c263603f48fd6307760a9d7b9 (patch) | |
| tree | bba9999108a0c09a89d847f44444a01b9978aa1d | |
| parent | fcdb4655aae28f9b720f7b41e89fb396d1d880f3 (diff) | |
| download | nginx-e90df45519dd259c263603f48fd6307760a9d7b9.tar.gz nginx-e90df45519dd259c263603f48fd6307760a9d7b9.tar.bz2 | |
Configure: added the NGX_ZLIB define.
This was introduced for conditional compilation of the code that requires
the zlib library.
| -rw-r--r-- | auto/lib/zlib/conf | 5 |
1 files changed, 4 insertions, 1 deletions
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 <zlib.h>" ngx_feature_path= |