diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-11-20 22:52:20 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-11-20 22:52:20 +0300 |
commit | d43bee8ee939992404d59ae0fec248ce46abecb0 (patch) | |
tree | 6eb79a6902f147bedb8c85350cbdc68543115907 /auto/lib | |
parent | 13376e1538e2b29e436805c626f6837b34a482c5 (diff) |
nginx-0.1.8-RELEASE importrelease-0.1.8
*) Bugfix: in the ngx_http_autoindex_module if the long file names were
in the listing.
*) Feature: the "^~" modifier in the location directive.
*) Feature: the proxy_max_temp_file_size directive.
Diffstat (limited to 'auto/lib')
-rw-r--r-- | auto/lib/md5/make | 90 | ||||
-rw-r--r-- | auto/lib/pcre/make | 78 | ||||
-rw-r--r-- | auto/lib/zlib/make | 101 |
3 files changed, 140 insertions, 129 deletions
diff --git a/auto/lib/md5/make b/auto/lib/md5/make index 6e2834e6d..5dfddfa23 100644 --- a/auto/lib/md5/make +++ b/auto/lib/md5/make @@ -2,35 +2,21 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM" - ;; - -esac - - -case $PLATFORM in - - win32) - line=`echo $MD5/md5.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - ;; - - *) - echo "$MD5/libmd5.a:" >> $MAKEFILE + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT -DMD5_ASM=$MD5_ASM" ;; esac @@ -42,12 +28,16 @@ done=NO case $PLATFORM in win32) - md5=`echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` + cp auto/lib/md5/$ngx_makefile $MD5 + + cat << END >> $NGX_MAKEFILE + +`echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo $MD5 | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. - cp auto/lib/md5/$makefile $MD5 - echo " cd $md5" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE +END done=YES ;; @@ -55,13 +45,15 @@ case $PLATFORM in SunOS:*:i86pc) if [ $MD5_ASM = YES ]; then - MD5_OPT="CFLAGS=\"$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN\"" + cat << END >> $NGX_MAKEFILE - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ=asm/mx86-sol.o \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE - echo " libmd5.a" >> $MAKEFILE +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\ + CC="\$(CC)" CPP="\$(CPP)" \\ + MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a + +END done=YES fi @@ -73,13 +65,15 @@ case $PLATFORM in *:i386 | *:i686) if [ $MD5_ASM = YES ]; then - MD5_OPT="CFLAGS=\"$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN\"" + cat << END >> $NGX_MAKEFILE + +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\ + CC="\$(CC)" CPP="\$(CPP)" \\ + MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) $MD5_OPT \\" >> $MAKEFILE - echo " MD5_ASM_OBJ=asm/mx86-elf.o \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" CPP=\"\$(CPP)\" \\" >> $MAKEFILE - echo " libmd5.a" >> $MAKEFILE +END done=YES fi @@ -89,10 +83,14 @@ esac if [ $done = NO ]; then - echo " cd $MD5 \\" >> $MAKEFILE - echo " && \$(MAKE) CFLAGS=\"$MD5_OPT\" \\" >> $MAKEFILE - echo " MD5_ASM_OBJ= CC=\"\$(CC)\" libmd5.a" >> $MAKEFILE -fi + cat << END >> $NGX_MAKEFILE + +$MD5/libmd5.a: $NGX_MAKEFILE + cd $MD5 \\ + && \$(MAKE) CFLAGS="$MD5_OPT" \\ + CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a -echo >> $MAKEFILE +END + +fi diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index 714994df5..a60fedb2d 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -2,21 +2,21 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT" + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -27,39 +27,45 @@ case $PLATFORM in win32) cp auto/lib/pcre/patch.pcre.in $PCRE cp auto/lib/pcre/patch.config.in $PCRE - cp auto/lib/pcre/$makefile $PCRE + cp auto/lib/pcre/$ngx_makefile $PCRE - pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` - line=`echo $PCRE/pcre.h: | sed -e "s/\//$ngx_regex_dirsep/g"` + ngx_pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - echo " cd $pcre" >> $MAKEFILE - echo " \$(MAKE) -f $makefile pcre.h" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE - echo >> $MAKEFILE + cat << END >> $NGX_MAKEFILE - line="$PCRE/pcre.lib: $PCRE/pcre.h" - line=`echo $line | sed -e "s/\//$ngx_regex_dirsep/g"` +`echo "$PCRE/pcre.h: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd $ngx_pcre + \$(MAKE) -f $ngx_makefile pcre.h + cd ..\\..\\.. + + +`echo "$PCRE/pcre.lib: $PCRE/pcre.h" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd $ngx_pcre + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. + +END - echo "$line" >> $MAKEFILE - echo " cd $pcre" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE ;; *) - PCRE_OPT="CFLAGS=\"$PCRE_OPT\"" - - echo "$PCRE/pcre.h:" >> $MAKEFILE - echo " cd $PCRE \\" >> $MAKEFILE - echo " && CC=\"\$(CC)\" $PCRE_OPT \\" >> $MAKEFILE - echo " ./configure --disable-shared" >> $MAKEFILE - echo >> $MAKEFILE - echo "$PCRE/.libs/libpcre.a: $PCRE/pcre.h" >> $MAKEFILE - echo " cd $PCRE \\" >> $MAKEFILE - echo " && \$(MAKE) libpcre.la" >> $MAKEFILE + cat << END >> $NGX_MAKEFILE + +$PCRE/pcre.h: $NGX_MAKEFILE + cd $PCRE \\ + && if [ -f Makefile ]; then \$(MAKE) distclean; fi + + cd $PCRE \\ + && CC="\$(CC)" CFLAGS="$PCRE_OPT" \\ + ./configure --disable-shared + + +$PCRE/.libs/libpcre.a: $PCRE/pcre.h + cd $PCRE \\ + && \$(MAKE) libpcre.la + +END + ;; esac - -echo >> $MAKEFILE diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 582276248..2e5ea8420 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -2,36 +2,22 @@ # Copyright (C) Igor Sysoev -case "$CC" in +case "$NGX_CC_NAME" in - cl) - makefile=makefile.msvc - opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + msvc*) + ngx_makefile=makefile.msvc + ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" ;; - wcl386) - makefile=makefile.owc - opt="CPU_OPT=$CPU_OPT" + owc*) + ngx_makefile=makefile.owc + ngx_opt="CPU_OPT=$CPU_OPT" ;; - bcc32) - makefile=makefile.bcc - opt="-DCPU_OPT=$CPU_OPT" - ;; - -esac - - -case $PLATFORM in - - win32) - line=`echo $ZLIB/zlib.lib: | sed -e "s/\//$ngx_regex_dirsep/g"` - echo "$line" >> $MAKEFILE - ;; - - *) - echo "$ZLIB/libz.a:" >> $MAKEFILE + bcc) + ngx_makefile=makefile.bcc + ngx_opt="-DCPU_OPT=$CPU_OPT" ;; esac @@ -43,12 +29,16 @@ done=NO case $PLATFORM in win32) - zlib=`echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + cp auto/lib/zlib/$ngx_makefile $ZLIB + + cat << END >> $NGX_MAKEFILE - cp auto/lib/zlib/$makefile $ZLIB - echo " cd $zlib" >> $MAKEFILE - echo " \$(MAKE) -f $makefile $opt" >> $MAKEFILE - echo " cd ..\\..\\.." >> $MAKEFILE +`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"` + \$(MAKE) -f $ngx_makefile $ngx_opt + cd ..\\..\\.. + +END done=YES ;; @@ -59,23 +49,35 @@ case $PLATFORM in *:i386 | *:i686) case $ZLIB_ASM in pentium) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm586/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm586/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; pentiumpro) - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && cp contrib/asm686/match.S . \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT -DASMV\" \\" >> $MAKEFILE - echo " CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) OBJA=match.o libz.a" >> $MAKEFILE + + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && cp contrib/asm686/match.S . \\ + && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) OBJA=match.o libz.a + +END done=YES ;; @@ -97,11 +99,16 @@ esac if [ $done = NO ]; then - echo " cd $ZLIB \\" >> $MAKEFILE - echo " && CFLAGS=\"$ZLIB_OPT\" CC=\"\$(CC)\" \\" >> $MAKEFILE - echo " ./configure \\" >> $MAKEFILE - echo " && \$(MAKE) libz.a" >> $MAKEFILE -fi + cat << END >> $NGX_MAKEFILE + +$ZLIB/libz.a: $NGX_MAKEFILE + cd $ZLIB \\ + && make clean \\ + && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ + ./configure \\ + && \$(MAKE) libz.a -echo >> $MAKEFILE +END + +fi |