Mercurial > hg > nginx
comparison auto/lib/zlib/conf @ 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 | d620f497c50f |
children | 78f8ac479735 |
comparison
equal
deleted
inserted
replaced
4986:3efc49b156d9 | 4987:66d001c5378c |
---|---|
7 CORE_INCS="$CORE_INCS $ZLIB" | 7 CORE_INCS="$CORE_INCS $ZLIB" |
8 | 8 |
9 case "$NGX_CC_NAME" in | 9 case "$NGX_CC_NAME" in |
10 | 10 |
11 msvc* | owc* | bcc) | 11 msvc* | owc* | bcc) |
12 have=NGX_ZLIB . auto/have | |
12 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" | 13 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" |
13 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" | 14 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" |
14 ;; | 15 ;; |
15 | 16 |
16 icc*) | 17 icc*) |
18 have=NGX_ZLIB . auto/have | |
17 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" | 19 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" |
18 | 20 |
19 # to allow -ipo optimization we link with the *.o but not library | 21 # to allow -ipo optimization we link with the *.o but not library |
20 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" | 22 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" |
21 CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o" | 23 CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o" |
28 CORE_LIBS="$CORE_LIBS $ZLIB/match.o" | 30 CORE_LIBS="$CORE_LIBS $ZLIB/match.o" |
29 fi | 31 fi |
30 ;; | 32 ;; |
31 | 33 |
32 *) | 34 *) |
35 have=NGX_ZLIB . auto/have | |
33 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" | 36 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" |
34 CORE_LIBS="$CORE_LIBS $ZLIB/libz.a" | 37 CORE_LIBS="$CORE_LIBS $ZLIB/libz.a" |
35 #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" | 38 #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" |
36 ;; | 39 ;; |
37 | 40 |
43 ZLIB=NO | 46 ZLIB=NO |
44 | 47 |
45 # FreeBSD, Solaris, Linux | 48 # FreeBSD, Solaris, Linux |
46 | 49 |
47 ngx_feature="zlib library" | 50 ngx_feature="zlib library" |
48 ngx_feature_name= | 51 ngx_feature_name="NGX_ZLIB" |
49 ngx_feature_run=no | 52 ngx_feature_run=no |
50 ngx_feature_incs="#include <zlib.h>" | 53 ngx_feature_incs="#include <zlib.h>" |
51 ngx_feature_path= | 54 ngx_feature_path= |
52 ngx_feature_libs="-lz" | 55 ngx_feature_libs="-lz" |
53 ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)" | 56 ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)" |