From 32769a772c54bd06edebcbf074d96a31022d7f31 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 25 Mar 2004 20:03:02 +0000 Subject: nginx-0.0.3-2004-03-25-23:03:02 import --- auto/lib/zlib/conf | 2 +- auto/lib/zlib/make | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'auto/lib/zlib') 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 -- cgit