summaryrefslogtreecommitdiffhomepage
path: root/auto/lib/zlib
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-04-18 19:06:02 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-04-18 19:06:02 +0000
commit9bfb434d241816749077e21f499b8efd41c3625d (patch)
treedefc89b07684b0bd31b77dd61825893e434392ba /auto/lib/zlib
parent32075f53e94183c647da58d4d832a58725d36c49 (diff)
downloadnginx-9bfb434d241816749077e21f499b8efd41c3625d.tar.gz
nginx-9bfb434d241816749077e21f499b8efd41c3625d.tar.bz2
nginx-0.0.3-2004-04-18-23:06:02 import
Diffstat (limited to 'auto/lib/zlib')
-rw-r--r--auto/lib/zlib/conf5
-rw-r--r--auto/lib/zlib/make5
2 files changed, 8 insertions, 2 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index 9c2178fad..37c1fa7ef 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -35,8 +35,11 @@ if [ $ZLIB != NONE ]; then
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
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 240b6474b..d25642533 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -77,8 +77,11 @@ case $PLATFORM in
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