mirror of
https://github.com/nginx/nginx.git
synced 2024-12-12 02:09:04 +08:00
d039a2e193
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
63 lines
1.5 KiB
Plaintext
63 lines
1.5 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
if [ $ZLIB != NONE ]; then
|
|
CORE_INCS="$CORE_INCS $ZLIB"
|
|
|
|
case "$NGX_CC_NAME" in
|
|
|
|
msvc* | owc* | bcc)
|
|
LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
|
|
;;
|
|
|
|
icc*)
|
|
LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
|
|
|
|
# to allow -ipo optimization we link with the *.o but not library
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/deflate.o"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/trees.o"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/zutil.o"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/compress.o"
|
|
|
|
if [ $ZLIB_ASM != NO ]; then
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/match.o"
|
|
fi
|
|
;;
|
|
|
|
*)
|
|
LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
|
|
CORE_LIBS="$CORE_LIBS $ZLIB/libz.a"
|
|
#CORE_LIBS="$CORE_LIBS -L $ZLIB -lz"
|
|
;;
|
|
|
|
esac
|
|
|
|
else
|
|
|
|
if [ "$NGX_PLATFORM" != win32 ]; then
|
|
ZLIB=NO
|
|
|
|
# FreeBSD, Solaris, Linux
|
|
|
|
ngx_feature="zlib library"
|
|
ngx_feature_name=
|
|
ngx_feature_run=no
|
|
ngx_feature_incs="#include <zlib.h>"
|
|
ngx_feature_libs="-lz"
|
|
ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)"
|
|
. auto/feature
|
|
|
|
|
|
if [ $ngx_found = yes ]; then
|
|
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
|
|
ZLIB=YES
|
|
ngx_found=no
|
|
fi
|
|
fi
|
|
|
|
fi
|