[nginx] svn commit: r4840 - trunk/auto/lib/zlib

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-09-11 12:35:30 +0000 (Tue, 11 Sep 2012)
New Revision: 4840
URL: http://trac.nginx.org/nginx/changeset/4840/nginx

Log:
Configure: provide inflate() when building zlib on win32.

It is now needed for gunzip filter.


Modified:
   trunk/auto/lib/zlib/makefile.bcc
   trunk/auto/lib/zlib/makefile.msvc
   trunk/auto/lib/zlib/makefile.owc

Modified: trunk/auto/lib/zlib/makefile.bcc
===================================================================
--- trunk/auto/lib/zlib/makefile.bcc	2012-09-11 01:13:23 UTC (rev 4839)
+++ trunk/auto/lib/zlib/makefile.bcc	2012-09-11 12:35:30 UTC (rev 4840)
@@ -8,8 +8,10 @@
 zlib.lib:
 	cd $(ZLIB)
 
-	bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \
-		compress.c
+	bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c \
+		trees.c zutil.c compress.c \
+		inflate.c inffast.c inftrees.c
 
 	tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
-		+trees.obj +zutil.obj +compress.obj
+		+trees.obj +zutil.obj +compress.obj \
+		+inflate.obj +inffast.obj +inftrees.obj

Modified: trunk/auto/lib/zlib/makefile.msvc
===================================================================
--- trunk/auto/lib/zlib/makefile.msvc	2012-09-11 01:13:23 UTC (rev 4839)
+++ trunk/auto/lib/zlib/makefile.msvc	2012-09-11 12:35:30 UTC (rev 4840)
@@ -8,7 +8,10 @@
 zlib.lib:
 	cd $(ZLIB)
 
-	cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
+	cl -c $(CFLAGS) adler32.c crc32.c deflate.c \
+		trees.c zutil.c compress.c \
+		inflate.c inffast.c inftrees.c
 
 	link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
-		trees.obj zutil.obj compress.obj
+		trees.obj zutil.obj compress.obj \
+		inflate.obj inffast.obj inftrees.obj

Modified: trunk/auto/lib/zlib/makefile.owc
===================================================================
--- trunk/auto/lib/zlib/makefile.owc	2012-09-11 01:13:23 UTC (rev 4839)
+++ trunk/auto/lib/zlib/makefile.owc	2012-09-11 12:35:30 UTC (rev 4840)
@@ -9,6 +9,6 @@
 	cd $(ZLIB)
 
 	wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c &
-		compress.c
+		compress.c inflate.c inffast.c inftrees.c
 	wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj &
-		zutil.obj compress.obj
+		zutil.obj compress.obj inflate.obj inffast.obj inftrees.obj