nginx-0.0.2-2004-03-10-23:56:39 import
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index d75a301..1cca3ad 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -31,24 +31,34 @@
cp auto/lib/md5/$makefile $MD5
echo " cd $MD5" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE
+ echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE
+ echo " CPU_OPT=$CPU_OPT MD5_ASM=$MD5_ASM" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
;;
SunOS:*:i86pc)
- echo " cd $MD5 && \$(MAKE) x86-solaris" >> $MAKEFILE
+ if [ $MD5_ASM = YES ]; then
+ echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-solaris" >> $MAKEFILE
+ else
+ echo " cd $MD5 \\" >> $MAKEFILE
+ echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE
+ echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE
+ fi
;;
*:i386)
- echo " cd $MD5 && \$(MAKE) x86-elf" >> $MAKEFILE
+ if [ $MD5_ASM = YES ]; then
+ echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-elf" >> $MAKEFILE
+ else
+ echo " cd $MD5 \\" >> $MAKEFILE
+ echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE
+ echo " MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE
+ fi
;;
*)
- if [ $CC = gcc ]; then
- echo " cd $MD5 && \$(MAKE) gcc" >> $MAKEFILE
- else
- echo " cd $MD5 && \$(MAKE) cc" >> $MAKEFILE
- fi
+ echo " cd $MD5 \\" >> $MAKEFILE
+ echo " && \$(MAKE) $MD5_OPT MD5_ASM_OBJ= CC=$CC all" >> $MAKEFILE
;;
esac
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index ad719c0..65ca4ab 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,6 +1,16 @@
-CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIB_OPT) -D MD5_ASM -D L_ENDIAN
+CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(CPU_OPT) -D L_ENDIAN
+
+!if "$(MD5_ASM)" == "YES"
+
+md5.lib:
+ cl $(CFLAGS) -D MD5_ASM md5_dgst.c
+ link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
+
+!else
md5.lib:
cl $(CFLAGS) md5_dgst.c
- link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
+ link -lib -out:md5.lib md5_dgst.obj
+
+!endif
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
index f02a742..2cb6b65 100644
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@@ -1,5 +1,5 @@
-CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(LIB_OPT)
+CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
md5.lib:
wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 8bfd943..d4f658e 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -32,14 +32,14 @@
cp auto/lib/pcre/patch.config $PCRE
cp auto/lib/pcre/$makefile $PCRE
echo " cd $PCRE" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
;;
*)
echo " cd $PCRE \\" >> $MAKEFILE
- echo $ngx_n " && CFLAGS=\"-O2 $LIB_OPT\"" $ngx_c >> $MAKEFILE
- echo " ./configure --disable-shared \\" >> $MAKEFILE
+ echo " && CC=$CC $PCRE_OPT \\" >> $MAKEFILE
+ echo " ./configure --disable-shared \\" >> $MAKEFILE
echo " && \$(MAKE)" >> $MAKEFILE
;;
diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc
index f651968..778607c 100644
--- a/auto/lib/pcre/makefile.msvc
+++ b/auto/lib/pcre/makefile.msvc
@@ -1,5 +1,5 @@
-CFLAGS = -O2 -Ob1 -Oi -Gs -MT $(LIB_OPT)
+CFLAGS = -O2 -Ob1 -Oi -Gs -MT $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc
index 5c15e87..7066215 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 $(LIB_OPT)
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index ff9ada0..50a6559 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -31,20 +31,28 @@
cp auto/lib/zlib/$makefile $ZLIB
echo " cd $ZLIB" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile LIB_OPT=$LIB_OPT" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
;;
*:i386 | *:i686)
- echo " cd $ZLIB \\" >> $MAKEFILE
- echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE
- echo " && CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE
- echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE
+ if [ $ZLIB_ASM = pentiumpro ]; then
+ echo " cd $ZLIB \\" >> $MAKEFILE
+ echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE
+ echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE
+ echo " && \$(MAKE) OBJA=match.o" >> $MAKEFILE
+ else
+ echo " cd $ZLIB \\" >> $MAKEFILE
+ echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE
+ echo " && \$(MAKE)" >> $MAKEFILE
+ fi
;;
*)
- echo " cd $ZLIB && ./configure && \$(MAKE)" >> $MAKEFILE
+ echo " cd $ZLIB \\" >> $MAKEFILE
+ echo " && CC=$CC $ZLIB_OPT ./configure \\" >> $MAKEFILE
+ echo " && \$(MAKE)" >> $MAKEFILE
;;
esac
diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc
index 1d38c5b..ebb11d3 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 $(LIB_OPT)
+CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(CPU_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 1a2823b..e119bb9 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 $(LIB_OPT)
+CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
zlib.lib:
wcl386 $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
