nginx-0.0.3-2004-03-29-21:43:58 import
diff --git a/auto/lib/make b/auto/lib/make
index 3bab86b..7acae50 100644
--- a/auto/lib/make
+++ b/auto/lib/make
@@ -1,12 +1,12 @@
-if [ $PCRE != NO ]; then
+if [ $PCRE != NONE -a $PCRE != NO ]; then
. auto/lib/pcre/make
fi
-if [ $MD5 != NO ]; then
+if [ $MD5 != NONE -a $MD5 != NO ]; then
. auto/lib/md5/make
fi
-if [ $ZLIB != NO ]; then
+if [ $ZLIB != NONE -a $ZLIB != NO ]; then
. auto/lib/zlib/make
fi
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 5c6a417..40fd747 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -10,17 +10,11 @@
OPENSSL_MD5=NO
fi
- CORE_INCS="$CORE_INCS -I $MD5"
+ CORE_INCS="$CORE_INCS $MD5"
case "$CC" in
- cl)
- LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
- CORE_LIBS="$CORE_LIBS md5.lib"
- CORE_LINK="$CORE_LINK -libpath:$MD5"
- ;;
-
- wcl386)
+ cl | wcl386 | bcc32)
LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
;;
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 485bf41..2632c9b 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -3,10 +3,17 @@
cl)
makefile=makefile.msvc
+ opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM"
;;
wcl386)
makefile=makefile.owc
+ opt="CPU_OPT=$CPU_OPT"
+ ;;
+
+ bcc32)
+ makefile=makefile.bcc
+ opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM"
;;
esac
@@ -15,7 +22,8 @@
case $PLATFORM in
win32)
- echo "$MD5/md5.lib:" >> $MAKEFILE
+ line=`echo $MD5/md5.lib: | sed -e "s/\//$DIRSEP/g"`
+ echo "$line" >> $MAKEFILE
;;
*)
@@ -31,11 +39,11 @@
case $PLATFORM in
win32)
+ md5=`echo $MD5 | sed -e "s/\//$DIRSEP/g"`
cp auto/lib/md5/$makefile $MD5
- echo " cd $MD5" >> $MAKEFILE
- echo $ngx_n " \$(MAKE) -f $makefile" $ngx_c >> $MAKEFILE
- echo " CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" >> $MAKEFILE
+ echo " cd $md5" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
done=YES
diff --git a/auto/lib/md5/makefile.bcc b/auto/lib/md5/makefile.bcc
new file mode 100644
index 0000000..e3dd8aa
--- /dev/null
+++ b/auto/lib/md5/makefile.bcc
@@ -0,0 +1,16 @@
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
+
+!if "$(MD5_ASM)" == "YES"
+
+md5.lib:
+ bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
+ tlib md5.lib +md5_dgst.obj +asm/m-win32.obj
+
+!else
+
+md5.lib:
+ bcc32 -c $(CFLAGS) md5_dgst.c
+ tlib md5.lib +md5_dgst.obj
+
+!endif
diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 7ba190d..c497c39 100644
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -1,16 +1,16 @@
-CFLAGS = -nologo -c -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
+CFLAGS = -nologo -MT -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
!if "$(MD5_ASM)" == "YES"
md5.lib:
- cl $(CFLAGS) -D MD5_ASM md5_dgst.c
+ cl -c $(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
+ cl -c $(CFLAGS) md5_dgst.c
link -lib -out:md5.lib md5_dgst.obj
!endif
diff --git a/auto/lib/md5/makefile.owc b/auto/lib/md5/makefile.owc
index 2cb6b65..917acba 100644
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@@ -1,6 +1,6 @@
-CFLAGS = -c -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
+CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
md5.lib:
- wcl386 $(CFLAGS) -dL_ENDIAN md5_dgst.c
+ wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
wlib -n md5.lib md5_dgst.obj
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 972c106..3f2c7a1 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -1,21 +1,12 @@
if [ $PCRE != NONE ]; then
- CORE_INCS="$CORE_INCS -I $PCRE"
+ CORE_INCS="$CORE_INCS $PCRE"
CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
case "$CC" in
- cl)
- have=HAVE_PCRE . auto/have
- have=PCRE_STATIC . auto/have
- CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
- LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
- CORE_LIBS="$CORE_LIBS pcre.lib"
- CORE_LINK="$CORE_LINK -libpath:$PCRE"
- ;;
-
- wcl386)
+ cl | wcl386 | bcc32)
have=HAVE_PCRE . auto/have
have=PCRE_STATIC . auto/have
CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index 1f26f5b..3a42eab 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -3,10 +3,17 @@
cl)
makefile=makefile.msvc
+ opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
;;
wcl386)
makefile=makefile.owc
+ opt="CPU_OPT=$CPU_OPT"
+ ;;
+
+ bcc32)
+ makefile=makefile.bcc
+ opt="-DCPU_OPT=$CPU_OPT"
;;
esac
@@ -19,14 +26,21 @@
cp auto/lib/pcre/patch.config.in $PCRE
cp auto/lib/pcre/$makefile $PCRE
- echo "$PCRE/pcre.h:" >> $MAKEFILE
- echo " cd $PCRE" >> $MAKEFILE
+ pcre=`echo $PCRE | sed -e "s/\//$DIRSEP/g"`
+ line=`echo $PCRE/pcre.h: | sed -e "s/\//$DIRSEP/g"`
+
+ echo "$line" >> $MAKEFILE
+ echo " cd $pcre" >> $MAKEFILE
echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
echo >> $MAKEFILE
- echo "$PCRE/pcre.lib: $PCRE/pcre.h" >> $MAKEFILE
- echo " cd $PCRE" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE
+
+ line="$PCRE/pcre.lib: $PCRE/pcre.h"
+ line=`echo $line | sed -e "s/\//$DIRSEP/g"`
+
+ echo "$line" >> $MAKEFILE
+ echo " cd $pcre" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
;;
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc
new file mode 100644
index 0000000..5744b90
--- /dev/null
+++ b/auto/lib/pcre/makefile.bcc
@@ -0,0 +1,17 @@
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT)
+PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10
+
+
+pcre.lib: pcre.h
+ bcc32 -q -edftables dftables.c
+
+ dftables > chartables.c
+
+ bcc32 -c $(CFLAGS) $(PCREFLAGS) maketables.c get.c study.c pcre.c
+
+ tlib pcre.lib +maketables.obj +get.obj +study.obj +pcre.obj
+
+pcre.h:
+ patch -o pcre.h pcre.in patch.pcre.in
+ patch -o config.h config.in patch.config.in
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf
index c699ca6..82cc5ed 100644
--- a/auto/lib/zlib/conf
+++ b/auto/lib/zlib/conf
@@ -1,16 +1,10 @@
if [ $ZLIB != NONE ]; then
- CORE_INCS="$CORE_INCS -I $ZLIB"
+ CORE_INCS="$CORE_INCS $ZLIB"
case "$CC" in
- cl)
- LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
- CORE_LIBS="$CORE_LIBS zlib.lib"
- CORE_LINK="$CORE_LINK -libpath:$ZLIB"
- ;;
-
- wcl386)
+ cl | wcl386 | bcc32)
LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
;;
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
index 00b08bb..c442730 100644
--- a/auto/lib/zlib/make
+++ b/auto/lib/zlib/make
@@ -3,10 +3,18 @@
cl)
makefile=makefile.msvc
+ opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
+
;;
wcl386)
makefile=makefile.owc
+ opt="CPU_OPT=$CPU_OPT"
+ ;;
+
+ bcc32)
+ makefile=makefile.bcc
+ opt="-DCPU_OPT=$CPU_OPT"
;;
esac
@@ -15,7 +23,8 @@
case $PLATFORM in
win32)
- echo "$ZLIB/zlib.lib:" >> $MAKEFILE
+ line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$DIRSEP/g"`
+ echo "$line" >> $MAKEFILE
;;
*)
@@ -31,10 +40,11 @@
case $PLATFORM in
win32)
+ zlib=`echo $ZLIB | sed -e "s/\//$DIRSEP/g"`
cp auto/lib/zlib/$makefile $ZLIB
- echo " cd $ZLIB" >> $MAKEFILE
- echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT LIBC=$LIBC">> $MAKEFILE
+ echo " cd $zlib" >> $MAKEFILE
+ echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE
echo " cd ..\\..\\.." >> $MAKEFILE
done=YES
diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc
new file mode 100644
index 0000000..0ec4de8
--- /dev/null
+++ b/auto/lib/zlib/makefile.bcc
@@ -0,0 +1,8 @@
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT)
+
+zlib.lib:
+ bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
+
+ tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
+ +trees.obj +zutil.obj
diff --git a/auto/lib/zlib/makefile.msvc b/auto/lib/zlib/makefile.msvc
index fe3f4f3..a9983ef 100644
--- a/auto/lib/zlib/makefile.msvc
+++ b/auto/lib/zlib/makefile.msvc
@@ -1,8 +1,8 @@
-CFLAGS = -nologo -c -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
+CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT)
zlib.lib:
- cl $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
+ cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
trees.obj zutil.obj
diff --git a/auto/lib/zlib/makefile.owc b/auto/lib/zlib/makefile.owc
index e119bb9..bc57d20 100644
--- a/auto/lib/zlib/makefile.owc
+++ b/auto/lib/zlib/makefile.owc
@@ -1,6 +1,6 @@
-CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT)
+CFLAGS = -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
+ wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c
wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj zutil.obj
