nginx-0.0.2-2004-03-11-18:42:41 import
diff --git a/auto/cc b/auto/cc
index d1cdea4..df0f31f 100644
--- a/auto/cc
+++ b/auto/cc
@@ -18,18 +18,20 @@
;;
esac
+ CFLAGS="$CFLAGS $PIPE"
CFLAGS="$CFLAGS $CPU_OPT"
if [ $PCRE_OPT = NO ]; then
- PCRE_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT\""
+ PCRE_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $PIPE $CPU_OPT\""
fi
if [ $MD5_OPT = NO ]; then
- MD5_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT\""
+ MD5_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $PIPE $CPU_OPT\""
fi
if [ $ZLIB_OPT = NO ]; then
- ZLIB_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $CPU_OPT $ZLIB_ASMV\""
+ ZLIB_OPT="CFLAGS=\"-O2 -fomit-frame-pointer"
+ ZLIB_OPT="$ZLIB_OPT $PIPE $CPU_OPT $ZLIB_ASMV\""
fi
# warnings
diff --git a/auto/configure b/auto/configure
index e89785f..0874b63 100755
--- a/auto/configure
+++ b/auto/configure
@@ -7,6 +7,14 @@
test -d $OBJS || mkdir $OBJS
echo > $NGX_AUTO_CONFIG_H
+if [ $DEBUG = YES ]; then
+ have=NGX_DEBUG . auto/have
+fi
+
+have=NGX_USE_HTTP_FILE_CACHE_UNIQ . auto/have
+have=NGX_SUPPRESS_WARN . auto/have
+
+
if [ "$PLATFORM" != win32 ]; then
. auto/headers
fi
diff --git a/auto/lib/md5/make b/auto/lib/md5/make
index 1cca3ad..c844c29 100644
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@@ -38,7 +38,9 @@
SunOS:*:i86pc)
if [ $MD5_ASM = YES ]; then
- echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-solaris" >> $MAKEFILE
+ echo " cd $MD5 \\" >> $MAKEFILE
+ echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE
+ echo " x86-solaris" >> $MAKEFILE
else
echo " cd $MD5 \\" >> $MAKEFILE
echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE
@@ -46,9 +48,11 @@
fi
;;
- *:i386)
+ *:i386 | *:i686)
if [ $MD5_ASM = YES ]; then
- echo " cd $MD5 && \$(MAKE) $MD5_OPT x86-elf" >> $MAKEFILE
+ echo " cd $MD5 \\" >> $MAKEFILE
+ echo " && \$(MAKE) $MD5_OPT MAKE=\$(MAKE) \\" >> $MAKEFILE
+ echo " x86-elf" >> $MAKEFILE
else
echo " cd $MD5 \\" >> $MAKEFILE
echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
index d4f658e..c903687 100644
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@@ -28,8 +28,8 @@
case $PLATFORM in
win32)
- cp auto/lib/pcre/patch.pcre $PCRE
- cp auto/lib/pcre/patch.config $PCRE
+ cp auto/lib/pcre/patch.pcre.in $PCRE
+ cp auto/lib/pcre/patch.config.in $PCRE
cp auto/lib/pcre/$makefile $PCRE
echo " cd $PCRE" >> $MAKEFILE
echo " \$(MAKE) -f $makefile CPU_OPT=$CPU_OPT" >> $MAKEFILE
@@ -37,7 +37,11 @@
;;
*)
+ # the patch allows to run the parallel make jobs
+ cp auto/lib/pcre/patch.Makefile.in $PCRE
+
echo " cd $PCRE \\" >> $MAKEFILE
+ echo " && patch < patch.Makefile.in \\" >> $MAKEFILE
echo " && CC=$CC $PCRE_OPT \\" >> $MAKEFILE
echo " ./configure --disable-shared \\" >> $MAKEFILE
echo " && \$(MAKE)" >> $MAKEFILE
diff --git a/auto/lib/pcre/patch.Makefile.in b/auto/lib/pcre/patch.Makefile.in
new file mode 100644
index 0000000..1b088ad
--- /dev/null
+++ b/auto/lib/pcre/patch.Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in Thu Mar 11 16:19:09 2004
++++ Makefile.in Thu Mar 11 16:21:16 2004
+@@ -96,7 +96,7 @@
+ OBJ = maketables.@OBJEXT@ get.@OBJEXT@ study.@OBJEXT@ pcre.@OBJEXT@ @POSIX_OBJ@
+ LOBJ = maketables.lo get.lo study.lo pcre.lo @POSIX_LOBJ@
+
+-all: libpcre.la @POSIX_LIB@ pcretest@EXEEXT@ pcregrep@EXEEXT@ @ON_WINDOWS@ winshared
++all: libpcre.la
+
+ pcregrep@EXEEXT@: libpcre.la pcregrep.@OBJEXT@ @ON_WINDOWS@ winshared
+ $(LINK) -o pcregrep@EXEEXT@ pcregrep.@OBJEXT@ libpcre.la
diff --git a/auto/lib/pcre/patch.config b/auto/lib/pcre/patch.config.in
similarity index 75%
rename from auto/lib/pcre/patch.config
rename to auto/lib/pcre/patch.config.in
index f2c48c2..d28b6fe 100644
--- a/auto/lib/pcre/patch.config
+++ b/auto/lib/pcre/patch.config.in
@@ -1,5 +1,5 @@
---- config.in.orig Thu Aug 21 14:43:07 2003
-+++ config.in Sun Mar 7 02:37:24 2004
+--- config.in Thu Aug 21 14:43:07 2003
++++ config.in Sun Mar 7 02:37:24 2004
@@ -28,7 +28,7 @@
found. */
diff --git a/auto/lib/pcre/patch.pcre b/auto/lib/pcre/patch.pcre.in
similarity index 82%
rename from auto/lib/pcre/patch.pcre
rename to auto/lib/pcre/patch.pcre.in
index 3406548..c49a68f 100644
--- a/auto/lib/pcre/patch.pcre
+++ b/auto/lib/pcre/patch.pcre.in
@@ -1,5 +1,5 @@
---- pcre.in.orig Thu Aug 21 14:43:07 2003
-+++ pcre.in Sun Mar 7 02:10:11 2004
+--- pcre.in Thu Aug 21 14:43:07 2003
++++ pcre.in Sun Mar 7 02:10:11 2004
@@ -10,9 +10,9 @@
/* The file pcre.h is build by "configure". Do not edit it; instead
make changes to pcre.in. */
diff --git a/auto/lib/zlib/patch.zlib b/auto/lib/zlib/patch.zlib
deleted file mode 100644
index c741011..0000000
--- a/auto/lib/zlib/patch.zlib
+++ /dev/null
@@ -1,19 +0,0 @@
---- msdos/Makefile.w32 Sat Nov 15 13:01:29 2003
-+++ msdos/Makefile.w32 Sat Nov 15 13:02:06 2003
-@@ -10,7 +10,7 @@
-
- # ------------- Microsoft Visual C++ 4.0 and later -------------
- MODEL=
--CFLAGS=-Ox -GA3s -nologo -W3
-+CFLAGS=-nologo -O2 -Ob1 -Oi -Gs -MT
- CC=cl
- LD=link
- LDFLAGS=
-@@ -79,7 +79,6 @@
- $(CC) -c $(CFLAGS) $*.c
-
- zlib.lib: $(OBJ1) $(OBJ2)
-- if exist zlib.lib del zlib.lib
- lib /OUT:zlib.lib $(OBJ1) $(OBJ2)
-
- example.exe: example.obj zlib.lib
diff --git a/auto/options b/auto/options
index 07263c9..17eb836 100644
--- a/auto/options
+++ b/auto/options
@@ -4,6 +4,7 @@
CC=gcc
OBJS=objs
+DEBUG=NO
CPU=NO
TEST_BUILD_DEVPOLL=NO
@@ -70,6 +71,7 @@
--with-cc=*) CC="$value" ;;
--with-cpu-opt=*) CPU="$value" ;;
+ --with-debug) DEBUG=YES ;;
--without-pcre) USE_PCRE=DISABLED ;;
--with-pcre=*) PCRE="$value" ;;
diff --git a/auto/os/freebsd b/auto/os/freebsd
index 3a73a6e..7ddd6dc 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -3,7 +3,7 @@
CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS"
CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS"
-CFLAGS="$CFLAGS -pipe"
+PIPE="-pipe"
# __FreeBSD_version is the best way to determine whether
diff --git a/auto/os/linux b/auto/os/linux
index abf2936..78ab3d1 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -4,7 +4,7 @@
CORE_SRCS="$UNIX_SRCS $LINUX_SRCS"
EVENT_MODULES="$EVENT_MODULES"
-CFLAGS="$CFLAGS -pipe"
+PIPE="-pipe"
CC_TEST_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
diff --git a/auto/os/solaris b/auto/os/solaris
index 7c2caf4..f1ac0f9 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -15,16 +15,24 @@
case $PLATFORM in
SunOS:5.[89]:* | SunOS:5.10:*)
- CFLAGS="$CFLAGS -pipe"
+ PIPE="-pipe"
;;
*)
- # Solaris 7's gcc does not support "-pipe"
+ # Solaris 7's /usr/ccs/bin/as does not support "-pipe"
;;
esac
+if [ $ZLIB_ASM != NO ]; then
+ echo "$0: error: the --with-zlib-asm=CPU option is not supported"
+ echo "on that platform"
+ echo
+
+ exit 1
+fi
+
ngx_inc="sys/devpoll.h"; . auto/inc
diff --git a/auto/summary b/auto/summary
index e0d8b26..16e552d 100644
--- a/auto/summary
+++ b/auto/summary
@@ -38,6 +38,7 @@
echo "--without-http_rewrite_module option"
echo "or you have to enable PCRE support"
echo
+
exit 1
fi
fi
@@ -50,6 +51,7 @@
echo "--without-http_gzip_module option"
echo "or you have to enable zlib support"
echo
+
exit 1
fi
fi
