diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
| commit | d039a2e193c9172e4f415b9304222e81804a69d0 (patch) | |
| tree | 4571d4da7950e9464e788a4d68dc5111167de52c /auto/lib/zlib | |
| parent | 174db74f2309e28c0e2b54e89b9e08afff187c7c (diff) | |
| download | nginx-release-0.1.21.tar.gz nginx-release-0.1.21.tar.bz2 | |
nginx-0.1.21-RELEASE importrelease-0.1.21
*) 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.
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 3 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 5 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.msvc | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.owc | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 8edd3f371..3123c669a 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -21,6 +21,7 @@ if [ $ZLIB != NONE ]; then 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" @@ -37,7 +38,7 @@ if [ $ZLIB != NONE ]; then else - if [ $NGX_PLATFORM != win32 ]; then + if [ "$NGX_PLATFORM" != win32 ]; then ZLIB=NO # FreeBSD, Solaris, Linux diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 8c1abdc44..1859a34b8 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -26,7 +26,7 @@ esac done=NO -case $NGX_PLATFORM in +case "$NGX_PLATFORM" in win32) cp auto/lib/zlib/$ngx_makefile $ZLIB diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc index 95e8800ad..2c764242c 100644 --- a/auto/lib/zlib/makefile.bcc +++ b/auto/lib/zlib/makefile.bcc @@ -5,7 +5,8 @@ CFLAGS = -q -O2 -tWM $(CPU_OPT) zlib.lib: - bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \ + compress.c tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \ - +trees.obj +zutil.obj + +trees.obj +zutil.obj +compress.obj diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc index 304b986cd..a4ee89a9c 100644 --- a/auto/lib/zlib/makefile.msvc +++ b/auto/lib/zlib/makefile.msvc @@ -5,7 +5,7 @@ CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) zlib.lib: - cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c + cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \ - trees.obj zutil.obj + trees.obj zutil.obj compress.obj diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc index 71ba512dc..dac43655f 100644 --- a/auto/lib/zlib/makefile.owc +++ b/auto/lib/zlib/makefile.owc @@ -5,5 +5,5 @@ CFLAGS = -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) zlib.lib: - wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c - wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj + wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c + wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj compress.obj |