diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/conf | 4 | ||||
| -rw-r--r-- | auto/cc/gcc | 15 | ||||
| -rw-r--r-- | auto/cc/icc | 2 | ||||
| -rw-r--r-- | auto/cc/owc | 2 | ||||
| -rw-r--r-- | auto/modules | 6 | ||||
| -rw-r--r-- | auto/options | 6 |
6 files changed, 25 insertions, 10 deletions
diff --git a/auto/cc/conf b/auto/cc/conf index 0a5db9e34..f064bca0d 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -2,6 +2,8 @@ # Copyright (C) Igor Sysoev +LINK="\$(CC)" + ngx_include_opt="-I " ngx_compile_opt="-c" ngx_objout="-o " @@ -56,7 +58,7 @@ else # # Compaq C V6.5-207 # # . auto/cc/ccc - ngx_include_opt="-I " + ngx_include_opt="-I" ;; # acc) diff --git a/auto/cc/gcc b/auto/cc/gcc index 24b908d26..d6647e52f 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -27,8 +27,13 @@ fi # optimizations -#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" -#CFLAGS="$CFLAGS -Os -fomit-frame-pointer" +#NGX_GCC_OPT="-O2" +#NGX_GCC_OPT="-Os" +NGX_GCC_OPT="-O" + +CFLAGS="$CFLAGS $NGX_GCC_OPT" + +#CFLAGS="$CFLAGS -fomit-frame-pointer" case $CPU in pentium) @@ -83,7 +88,9 @@ fi # warnings -CFLAGS="$CFLAGS -O -W" +# -W requires at least -O +CFLAGS="$CFLAGS ${NGX_GCC_OPT:-O} -W" + CFLAGS="$CFLAGS -Wall -Wpointer-arith" #CFLAGS="$CFLAGS -Wconversion" #CFLAGS="$CFLAGS -Winline" @@ -103,5 +110,3 @@ CFLAGS="$CFLAGS -g" if [ ".$CPP" = "." ]; then CPP="$CC -E" fi - -LINK="\$(CC)" diff --git a/auto/cc/icc b/auto/cc/icc index b036cb645..2195c10db 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -68,5 +68,3 @@ CFLAGS="$CFLAGS -Werror" # debug CFLAGS="$CFLAGS -g" - -LINK="\$(CC)" diff --git a/auto/cc/owc b/auto/cc/owc index 88ffdb1f8..06e5cc0e0 100644 --- a/auto/cc/owc +++ b/auto/cc/owc @@ -69,8 +69,6 @@ NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" -LINK="\$(CC)" - # the link flags, built target is NT GUI mode application CORE_LINK="$CORE_LINK -l=nt_win" diff --git a/auto/modules b/auto/modules index 375b755f0..2c001e28b 100644 --- a/auto/modules +++ b/auto/modules @@ -156,6 +156,12 @@ fi #HTTP_SRCS="$HTTP_SRCS $HTPP_CACHE_SRCS" #HTTP_SRCS="$HTTP_SRCS $HTPP_FILE_CACHE_SRCS" +if [ $HTTP_STUB_STATUS = YES ]; then + have=NGX_STAT_STUB . auto/have + HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module" + HTTP_SRCS="$HTTP_SRCS src/http/modules/ngx_http_stub_status_module.c" +fi + if [ -r $NGX_OBJS/auto ]; then . $NGX_OBJS/auto fi diff --git a/auto/options b/auto/options index 9aff6e228..7bb93ac74 100644 --- a/auto/options +++ b/auto/options @@ -58,6 +58,9 @@ HTTP_REWRITE=YES HTTP_PROXY=YES HTTP_FASTCGI=YES +# STUB +HTTP_STUB_STATUS=NO + IMAP=NO NGX_MODULES= @@ -131,6 +134,9 @@ do --without-http_proxy_module) HTTP_PROXY=NO ;; --without-http_fastcgi_module) HTTP_FASTCGI=NO ;; + # STUB + --with-http_stub_status_module) HTTP_STUB_STATUS=YES ;; + --with-imap) IMAP=YES ;; --with-module=*) NGX_MODULES="$NGX_MODULES $values" ;; |