IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.0.2-2004-03-11-18:42:41 import

Browse Source
This commit is contained in:
Igor Sysoev
2004-03-11 15:42:41 +00:00
parent 7b90834fba
commit 6bb889f442
13 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
auto/cc
View File

@@ -18,18 +18,20 @@ case $CC in
;;
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

8
auto/configure vendored
View File

@@ -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

10
auto/lib/md5/make
View File

@@ -38,7 +38,9 @@ case $PLATFORM in
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 @@ case $PLATFORM in
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

8
auto/lib/pcre/make
View File

@@ -28,8 +28,8 @@ esac
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 @@ case $PLATFORM in
;;
*)
# 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

11
auto/lib/pcre/patch.Makefile.in Normal file
View File

@@ -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

4
auto/lib/pcre/patch.config → auto/lib/pcre/patch.config.in
View File

@@ -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. */

4
auto/lib/pcre/patch.pcre → auto/lib/pcre/patch.pcre.in
View File

@@ -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. */

19
auto/lib/zlib/patch.zlib
View File

@@ -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

2
auto/options
View File

@@ -4,6 +4,7 @@ help=no
CC=gcc
OBJS=objs
DEBUG=NO
CPU=NO
TEST_BUILD_DEVPOLL=NO
@@ -70,6 +71,7 @@ do
--with-cc=*) CC="$value" ;;
--with-cpu-opt=*) CPU="$value" ;;
--with-debug) DEBUG=YES ;;
--without-pcre) USE_PCRE=DISABLED ;;
--with-pcre=*) PCRE="$value" ;;

2
auto/os/freebsd
View File

@@ -3,7 +3,7 @@ CORE_INCS="$UNIX_INCS"
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

2
auto/os/linux
View File

@@ -4,7 +4,7 @@ CORE_DEPS="$UNIX_DEPS $LINUX_DEPS"
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"

12
auto/os/solaris
View File

@@ -15,16 +15,24 @@ CC_TEST_FLAGS="-D_FILE_OFFSET_BITS=64"
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

2
auto/summary
View File

@@ -38,6 +38,7 @@ if [ $HTTP_REWRITE = YES ]; then
echo "--without-http_rewrite_module option"
echo "or you have to enable PCRE support"
echo
exit 1
fi
fi
@@ -50,6 +51,7 @@ if [ $HTTP_GZIP = YES ]; then
echo "--without-http_gzip_module option"
echo "or you have to enable zlib support"
echo
exit 1
fi
fi