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 /auto/lib/zlib | |
| parent | 89690bfe02703853c3e987d1e5c4d9878c4d28f0 (diff) | |
| download | nginx-32769a772c54bd06edebcbf074d96a31022d7f31.tar.gz nginx-32769a772c54bd06edebcbf074d96a31022d7f31.tar.bz2 | |
nginx-0.0.3-2004-03-25-23:03:02 import
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 11 |
2 files changed, 8 insertions, 5 deletions
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 |