nginx-0.0.2-2004-03-05-19:37:51 import

diff --git a/auto/lib/md5/makefile.msvc b/auto/lib/md5/makefile.msvc
index 60a662407de25af5fa2ba8ddb018c197616cda70..a45fc52eb5a3853060b974478f2f56f1ec85a487 100644 (file)
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@@ -2,4 +2,5 @@
 all:
        cl -nologo -c -MT -O2 -Ob1 -Oi -Gs -D MD5_ASM -D L_ENDIAN       \
                md5_dgst.c md5_one.c
+
        link -lib -out:md5.lib md5_dgst.obj md5_one.obj asm/m-win32.obj

diff --git a/auto/make b/auto/make
index e4e1a266170c1d110e8dd0c84e2789bbe4023f52..5a019db3d6e976939811c8a9541ddcdb67fa47f6 100644 (file)
--- a/auto/make
+++ b/auto/make
@@ -158,7 +158,7 @@ do
     fi
 
     if [ $MAKE_SL = YES ]; then
-        echo $ngx_n " $obj," $ngx_c                                >> $MAKEFILE
+        echo $ngx_n " $obj" $ngx_c                                >> $MAKEFILE
     else
         echo " $obj \\"                                          >> $MAKEFILE
     fi

diff --git a/auto/os/solaris b/auto/os/solaris
index dd6c85cab453f6804dd70e24113d4d7ae9771f50..818886bede6252e248fc5a690c3a5147cc0ac4c8 100644 (file)
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -6,6 +6,9 @@ EVENT_MODULES="$EVENT_MODULES"
 
 CORE_LIBS="$CORE_LIBS -lsocket -lnsl"
 
+# the Solaris's make support
+MAKE_SL=YES
+
 
 CC_TEST_FLAGS="-D_FILE_OFFSET_BITS=64"