# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1080244982 0
# Node ID 99b349386504cc2b83cc6dc762d9b0af998aa1ba
# Parent  5cfd65b8b0a7446feaa31747b84c435cb24b1c8d
nginx-0.0.3-2004-03-25-23:03:02 import

diff --git a/auto/cc b/auto/cc
--- 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 @@ 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
 
diff --git a/auto/make b/auto/make
--- a/auto/make
+++ b/auto/make
@@ -7,7 +7,7 @@ mkdir -p $OBJS/src/core $OBJS/src/event 
 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
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -15,7 +15,7 @@ fi
 
 case $PLATFORM in
 
-    FreeBSD:*)
+    FreeBSD:* | DragonFly:*)
         . auto/os/freebsd
     ;;