IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-19 05:33:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Configure: added the NGX_ZLIB define.

Browse Source 
This was introduced for conditional compilation of the code that requires
the zlib library.
This commit is contained in:
Valentin Bartenev 2012-12-23 16:04:14 +00:00
parent fcdb4655aa
commit e90df45519
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auto/lib/zlib/conf
View File

@ -9,11 +9,13 @@ if [ $ZLIB != NONE ]; then
case "$NGX_CC_NAME" in case "$NGX_CC_NAME" in
msvc* | owc* | bcc) msvc* | owc* | bcc)
have=NGX_ZLIB . auto/have
LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
;; ;;
icc*) icc*)
have=NGX_ZLIB . auto/have
LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
# to allow -ipo optimization we link with the *.o but not library # 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" LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
CORE_LIBS="$CORE_LIBS $ZLIB/libz.a" CORE_LIBS="$CORE_LIBS $ZLIB/libz.a"
#CORE_LIBS="$CORE_LIBS -L $ZLIB -lz" #CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
@ -45,7 +48,7 @@ else
# FreeBSD, Solaris, Linux # FreeBSD, Solaris, Linux
ngx_feature="zlib library" ngx_feature="zlib library"
ngx_feature_name= ngx_feature_name="NGX_ZLIB"
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <zlib.h>" ngx_feature_incs="#include <zlib.h>"
ngx_feature_path= ngx_feature_path=