Mercurial > hg > nginx-vendor-current

comparison auto/lib/zlib/conf @ 4:4b2dafa26fe2 NGINX_0_1_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.2 *) 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; bug 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; bug 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.
author Igor Sysoev <http://sysoev.ru>
date Thu, 21 Oct 2004 00:00:00 +0400
parents f0b350454894
children 46833bd150cb
comparison
equal deleted inserted replaced
3:8beaf7b3241f 4:4b2dafa26fe2
3 3
4 4
5 if [ $ZLIB != NONE ]; then 5 if [ $ZLIB != NONE ]; then
6 CORE_INCS="$CORE_INCS $ZLIB" 6 CORE_INCS="$CORE_INCS $ZLIB"
7 7
8 case "$CC" in 8 case "$NGX_CC_NAME" in
9 9
10 cl | wcl386 | bcc32) 10 msvc | owc | bcc)
11 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" 11 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
12 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" 12 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
13 ;; 13 ;;
14 14
15 *icc) 15 icc)
16 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" 16 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
17 17
18 # to allow -ipo optimization we link with the *.o but not library 18 # to allow -ipo optimization we link with the *.o but not library
19 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" 19 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o"
20 CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o" 20 CORE_LIBS="$CORE_LIBS $ZLIB/crc32.o"
36 esac 36 esac
37 37
38 else 38 else
39 39
40 if [ $PLATFORM != win32 ]; then 40 if [ $PLATFORM != win32 ]; then
41 ZLIB=NO
41 42
42 # FreeBSD, Solaris, Linux 43 # FreeBSD, Solaris, Linux
43 44
44 ngx_lib_cflags= 45 ngx_feature="zlib library"
45 ngx_lib_inc="#include <zlib.h>" 46 ngx_feature_name="zlib"
46 ngx_lib="zlib library" 47 ngx_feature_run=no
47 ngx_lib_test="z_stream z; deflate(&z, Z_NO_FLUSH)" 48 ngx_feature_incs="#include <zlib.h>"
48 ngx_libs=-lz 49 ngx_feature_libs="-lz"
49 . auto/lib/test 50 ngx_feature_test="z_stream z; deflate(&z, Z_NO_FLUSH)"
51 . auto/feature
50 52
51 53
52 if [ $ngx_found = yes ]; then 54 if [ $ngx_found = yes ]; then
53 CORE_LIBS="$CORE_LIBS $ngx_libs" 55 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
54 ZLIB=YES 56 ZLIB=YES
55 else 57 ngx_found=no
56 ZLIB=NO
57 fi 58 fi
58 fi 59 fi
59 60
60 fi 61 fi