mirror of
https://github.com/nginx/nginx.git
synced 2024-12-20 14:13:33 -06:00
c0edbcce58
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
62 lines
1.4 KiB
Plaintext
62 lines
1.4 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"
|
|
|
|
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 [ $PLATFORM != win32 ]; then
|
|
ZLIB=NO
|
|
|
|
# FreeBSD, Solaris, Linux
|
|
|
|
ngx_feature="zlib library"
|
|
ngx_feature_name="zlib"
|
|
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
|