nginx-0.0.2-2004-03-10-20:55:19 import

9 files changed, 14 insertions, 19 deletions

diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 43d35bf6a..d75a301e2 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -31,11 +31,11 @@ case $PLATFORM in
 
         cp auto/lib/md5/$makefile $MD5
         echo "	cd $MD5"                                          >> $MAKEFILE
-        echo "	\$(MAKE) -f $makefile OWC_OPT=$OWC_OPT"           >> $MAKEFILE
+        echo "	\$(MAKE) -f $makefile LIB_OPT=$LIB_OPT"           >> $MAKEFILE
         echo "	cd ..\\..\\.."                                    >> $MAKEFILE
     ;;
 
-    SunOS:*:i386)
+    SunOS:*:i86pc)
         echo "	cd $MD5 && \$(MAKE) x86-solaris"                  >> $MAKEFILE
     ;;
 
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 3dbda09ee..ad719c050 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,5 +1,5 @@
 
-CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN
+CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIB_OPT) -D MD5_ASM -D L_ENDIAN
 
 md5.lib:
 	cl $(CFLAGS) md5_dgst.c
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
index f3209409e..f02a742ec 100644
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@@ -1,12 +1,6 @@
 
-CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s $(OWC_OPT)
+CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(LIB_OPT)
 
 md5.lib:
-	wcl386 $(CFLAGS) -bm -dL_ENDIAN md5_dgst.c
+	wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c
 	wlib -n md5.lib md5_dgst.obj
-
-#md5.lib:
-asm:
-	wcl386 $(CFLAGS) -bm -dMD5_ASM -dL_ENDIAN md5_dgst.c
-	wcl386 $(CFLAGS) asm\m-win32.asm
-	wlib -n md5.lib md5_dgst.obj m-win32.obj
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 6ea086da6..8bfd9438e 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -32,13 +32,14 @@ case $PLATFORM in
         cp auto/lib/pcre/patch.config $PCRE
         cp auto/lib/pcre/$makefile $PCRE
         echo "	cd $PCRE"                                         >> $MAKEFILE
-        echo "	\$(MAKE) -f $makefile OWC_OPT=$OWC_OPT"           >> $MAKEFILE
+        echo "	\$(MAKE) -f $makefile LIB_OPT=$LIB_OPT"           >> $MAKEFILE
         echo "	cd ..\\..\\.."                                    >> $MAKEFILE
     ;;
 
     *)
         echo "	cd $PCRE \\"                                      >> $MAKEFILE
-        echo "	&& ./configure --disable-shared \\"               >> $MAKEFILE
+        echo $ngx_n "	&& CFLAGS=\"-O2 $LIB_OPT\"" $ngx_c        >> $MAKEFILE
+        echo " ./configure --disable-shared \\"                   >> $MAKEFILE
         echo "	&& \$(MAKE)"                                      >> $MAKEFILE
     ;;
 
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index 0eeb310ab..f65196821 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -1,5 +1,5 @@
 
-CFLAGS =	-O2 -Ob1 -Oi -Gs -MT
+CFLAGS =	-O2 -Ob1 -Oi -Gs -MT $(LIB_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index f4244a6c0..5c15e8770 100644
--- a/auto/lib/pcre/makefile.owc
+++ b/auto/lib/pcre/makefile.owc
@@ -1,5 +1,5 @@
 
-CFLAGS =	-c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT)
+CFLAGS =	-c -zq -bt=nt -ot -op -oi -oe -s -bm $(LIB_OPT)
 PCREFLAGS =	-DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
 
 
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 05b2e86fa..ff9ada0ae 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -31,12 +31,12 @@ case $PLATFORM in
 
         cp auto/lib/zlib/$makefile $ZLIB
         echo "	cd $ZLIB"                                         >> $MAKEFILE
-        echo "	\$(MAKE) -f $makefile OWC_OPT=$OWC_OPT"           >> $MAKEFILE
+        echo "	\$(MAKE) -f $makefile LIB_OPT=$LIB_OPT"           >> $MAKEFILE
         echo "	cd ..\\..\\.."                                    >> $MAKEFILE
     ;;
 
 
-    *:i386)
+    *:i386 | *:i686)
         echo "	cd $ZLIB \\"                                      >> $MAKEFILE
         echo "	&& cp contrib/asm686/match.S . \\"                >> $MAKEFILE
         echo "	&& CFLAGS=\"-O3 -DASMV\" ./configure \\"          >> $MAKEFILE
diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc
index 69f0c1897..1d38c5b6c 100644
--- a/auto/lib/zlib/makefile.msvc
+++ b/auto/lib/zlib/makefile.msvc
@@ -1,5 +1,5 @@
 
-CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs
+CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIB_OPT)
 
 zlib.lib:
 	cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc
index 3fa026040..1a2823b40 100644
--- a/auto/lib/zlib/makefile.owc
+++ b/auto/lib/zlib/makefile.owc
@@ -1,5 +1,5 @@
 
-CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(OWC_OPT)
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(LIB_OPT)
 
 zlib.lib:
 	wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c