nginx-0.0.3-2004-03-25-23:03:02 import
diff --git a/auto/cc b/auto/cc
index 9c5459d..377c442 100644
--- a/auto/cc
+++ b/auto/cc
@@ -1,7 +1,7 @@
case $CC in
- *gcc)
+ *gcc*)
# gcc 2.95.4, 3.3.2
# optimization
@@ -24,8 +24,7 @@
;;
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 57662f7..5c6a417 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -12,7 +12,7 @@
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 26c2f48..485bf41 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 @@
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 @@
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 @@
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 fe82130..972c106 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -4,7 +4,7 @@
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 a4f1402..1f26f5b 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 @@
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 7542312..c699ca6 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 46cd653..00b08bb 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 @@
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 @@
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 @@
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
diff --git a/auto/make b/auto/make
index 294a9cb..4ba216d 100644
--- a/auto/make
+++ b/auto/make
@@ -7,7 +7,7 @@
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 2a6f99e..31a041f 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -15,7 +15,7 @@
case $PLATFORM in
- FreeBSD:*)
+ FreeBSD:* | DragonFly:*)
. auto/os/freebsd
;;
