nginx-0.0.3-2004-04-18-23:06:02 import

auto/lib/zlib/conf

diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index 9c2178f..37c1fa7 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -35,8 +35,11 @@
 else
 
     if [ $PLATFORM != win32 ]; then
-        ngx_lib_inc="#include <zlib.h>"
 
+        # FreeBSD, Solaris, Linux
+
+        ngx_lib_cflags=
+        ngx_lib_inc="#include <zlib.h>"
         ngx_lib="zlib library"
         ngx_lib_test="z_stream z; deflate(&z, Z_NO_FLUSH)"
         ngx_libs=-lz

auto/lib/zlib/make

diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 240b647..d256425 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -77,8 +77,11 @@
                 done=YES
             ;;
 
+            NO)
+            ;;
+
             *)
-                echo "$0: error: invalid --with-zlib=asm=$ZLIB_ASM option."
+                echo "$0: error: invalid --with-zlib-asm=$ZLIB_ASM option."
                 echo "The valid values are \"pentium\" and \"pentiumpro\" only".
                 echo