diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-25 20:03:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-25 20:03:02 +0000 |
| commit | 32769a772c54bd06edebcbf074d96a31022d7f31 (patch) | |
| tree | 5f4793c2d5210e06ff855425e8e8c11da826075b | |
| parent | 89690bfe02703853c3e987d1e5c4d9878c4d28f0 (diff) | |
| download | nginx-32769a772c54bd06edebcbf074d96a31022d7f31.tar.gz nginx-32769a772c54bd06edebcbf074d96a31022d7f31.zip | |
nginx-0.0.3-2004-03-25-23:03:02 import
| -rw-r--r-- | auto/cc | 5 | ||||
| -rw-r--r-- | auto/lib/md5/conf | 2 | ||||
| -rw-r--r-- | auto/lib/md5/make | 10 | ||||
| -rw-r--r-- | auto/lib/pcre/conf | 2 | ||||
| -rw-r--r-- | auto/lib/pcre/make | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/conf | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 11 | ||||
| -rw-r--r-- | auto/make | 2 | ||||
| -rw-r--r-- | auto/os/conf | 2 |
9 files changed, 22 insertions, 18 deletions
@@ -1,7 +1,7 @@ case $CC in - *gcc) + *gcc*) # gcc 2.95.4, 3.3.2 # optimization @@ -24,8 +24,7 @@ case $CC in ;; esac - CFLAGS="$CFLAGS $PIPE" - CFLAGS="$CFLAGS $CPU_OPT" + CFLAGS="$CFLAGS $PIPE $CPU_OPT" if [ ".$PCRE_OPT" = "." ]; then PCRE_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 57662f702..5c6a417a0 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -12,7 +12,7 @@ if [ $MD5 != NONE ]; then CORE_INCS="$CORE_INCS -I $MD5" - case $CC in + case "$CC" in cl) LINK_DEPS="$LINK_DEPS $MD5/md5.lib" diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 26c2f4858..485bf41eb 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -1,5 +1,5 @@ -case $CC in +case "$CC" in cl) makefile=makefile.msvc @@ -49,7 +49,8 @@ case $PLATFORM in echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE echo " MD5_ASM_OBJ=asm/mx86-sol.o \\" >> $MAKEFILE - echo " CC=$CC CPP=\"$CPP\" libmd5.a" >> $MAKEFILE + echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE + echo " libmd5.a" >> $MAKEFILE done=YES fi @@ -66,7 +67,8 @@ case $PLATFORM in echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE - echo " CC=$CC CPP=\"$CPP\" libmd5.a" >> $MAKEFILE + echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE + echo " libmd5.a" >> $MAKEFILE done=YES fi @@ -78,7 +80,7 @@ esac if [ $done = NO ]; then echo " cd $MD5 \\" >> $MAKEFILE echo " && \$(MAKE) CFLAGS=\"$MD5_OPT\" \\" >> $MAKEFILE - echo " MD5_ASM_OBJ= CC=$CC libmd5.a" >> $MAKEFILE + echo " MD5_ASM_OBJ= CC=\"\$(CC)\" libmd5.a" >> $MAKEFILE fi diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index fe8213000..972c10682 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -4,7 +4,7 @@ if [ $PCRE != NONE ]; then CORE_DEPS="$CORE_DEPS $REGEX_DEPS" CORE_SRCS="$CORE_SRCS $REGEX_SRCS" - case $CC in + case "$CC" in cl) have=HAVE_PCRE . auto/have diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index a4f140224..1f26f5b83 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -1,5 +1,5 @@ -case $CC in +case "$CC" in cl) makefile=makefile.msvc @@ -35,7 +35,7 @@ case $PLATFORM in echo "$PCRE/pcre.h:" >> $MAKEFILE echo " cd $PCRE \\" >> $MAKEFILE - echo " && CC=$CC $PCRE_OPT \\" >> $MAKEFILE + echo " && CC=\"\$(CC)\" $PCRE_OPT \\" >> $MAKEFILE echo " ./configure --disable-shared" >> $MAKEFILE echo >> $MAKEFILE echo "$PCRE/.libs/libpcre.a: $PCRE/pcre.h" >> $MAKEFILE diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 754231221..c699ca63f 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -2,7 +2,7 @@ if [ $ZLIB != NONE ]; then CORE_INCS="$CORE_INCS -I $ZLIB" - case $CC in + case "$CC" in cl) LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 46cd653d9..00b08bb1e 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -1,5 +1,5 @@ -case $CC in +case "$CC" in cl) makefile=makefile.msvc @@ -48,7 +48,8 @@ case $PLATFORM in pentium) echo " cd $ZLIB \\" >> $MAKEFILE echo " && cp contrib/asm586/match.S . \\" >> $MAKEFILE - echo " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " CC=\"\$(CC)\" \\" >> $MAKEFILE echo " ./configure \\" >> $MAKEFILE echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE @@ -58,7 +59,8 @@ case $PLATFORM in pentiumpro) echo " cd $ZLIB \\" >> $MAKEFILE echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CC=$CC CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE + echo " CC=\"\$(CC)\" \\" >> $MAKEFILE echo " ./configure \\" >> $MAKEFILE echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE @@ -72,7 +74,8 @@ esac if [ $done = NO ]; then echo " cd $ZLIB \\" >> $MAKEFILE - echo " && CC=$CC CFLAGS=\"$ZLIB_OPT\" ./configure \\" >> $MAKEFILE + echo " && CFLAGS=\"$ZLIB_OPT\" CC=\"\$(CC)\" \\" >> $MAKEFILE + echo " ./configure \\" >> $MAKEFILE echo " && \$(MAKE) libz.a" >> $MAKEFILE fi @@ -7,7 +7,7 @@ mkdir -p $OBJS/src/core $OBJS/src/event $OBJS/src/event/modules \ echo "CC = $CC" > $MAKEFILE echo "CPP = $CPP" >> $MAKEFILE echo "LINK = $LINK" >> $MAKEFILE -if [ $CC = wcl386 ]; then +if [ "$CC" = wcl386 ]; then echo MAKE = wmake >> $MAKEFILE fi echo "CFLAGS = $CFLAGS" >> $MAKEFILE diff --git a/auto/os/conf b/auto/os/conf index 2a6f99e8c..31a041f96 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -15,7 +15,7 @@ fi case $PLATFORM in - FreeBSD:*) + FreeBSD:* | DragonFly:*) . auto/os/freebsd ;; |