diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/gcc | 7 | ||||
| -rw-r--r-- | auto/cc/icc | 24 | ||||
| -rw-r--r-- | auto/modules | 14 | ||||
| -rw-r--r-- | auto/sources | 13 |
4 files changed, 48 insertions, 10 deletions
diff --git a/auto/cc/gcc b/auto/cc/gcc index 2e5906a75..c5db85885 100644 --- a/auto/cc/gcc +++ b/auto/cc/gcc @@ -4,7 +4,7 @@ # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2 # 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4.0, 3.4.2 -# 4.0.0 +# 4.0.0, 4.0.1, 4.1.0 NGX_GCC_VER=`$CC -v 2>&1 | grep 'gcc version' 2>&1 \ @@ -57,6 +57,11 @@ case $CPU in CPU_OPT="-march=pentium4" ;; + athlon) + # optimize for Athlon, gcc 3.x + CPU_OPT="-march=athlon" + ;; + opteron) # optimize for Opteron, gcc 3.x CPU_OPT="-march=opteron" diff --git a/auto/cc/icc b/auto/cc/icc index a0f676e6d..1c59c5561 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -4,6 +4,12 @@ # Intel C++ compiler 7.1, 8.0, 8.1 +NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ + | sed -e 's/^.* Version \(.*\) Build.*$/\1/'` + +echo " + icc version: $NGX_ICC_VER" + + # optimizations CFLAGS="$CFLAGS -O" @@ -72,8 +78,6 @@ CFLAGS="$CFLAGS -wd269" CFLAGS="$CFLAGS -wd810" # parameter was never referenced CFLAGS="$CFLAGS -wd869" -# "cc" clobber ignored, warnings for Liunx's htons() -CFLAGS="$CFLAGS -wd1469" # STUB # enumerated type mixed with another type @@ -86,8 +90,20 @@ CFLAGS="$CFLAGS -wd981" CFLAGS="$CFLAGS -wd1418" # external declaration in primary source file CFLAGS="$CFLAGS -wd1419" -# non-POD class type passed through ellipsis -CFLAGS="$CFLAGS -wd1595" + +case "$NGX_ICC_VER" in + 8.*) + # "cc" clobber ignored, warnings for Liunx's htons() + CFLAGS="$CFLAGS -wd1469" + + # STUB + # non-POD class type passed through ellipsis + CFLAGS="$CFLAGS -wd1595" + ;; + + *) + ;; +esac # stop on warning CFLAGS="$CFLAGS -Werror" diff --git a/auto/modules b/auto/modules index b032f05cd..dccb7a7db 100644 --- a/auto/modules +++ b/auto/modules @@ -51,6 +51,12 @@ if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then fi +if [ $HTTP != YES ]; then + have=NGX_CRYPT . auto/nohave + CRYPT_LIB= +fi + + if [ $HTTP_SSI = YES ]; then HTTP_POSTPONE=YES fi @@ -219,10 +225,14 @@ if [ $HTTP = YES ]; then fi -IMAP_MODULES=$IMAP_MODULE - if [ $IMAP = YES ]; then modules="$modules $IMAP_MODULES" + + modules="$modules $IMAP_AUTH_HTTP_MODULE" + IMAP_SRCS="$IMAP_SRCS $IMAP_AUTH_HTTP_SRCS" + + modules="$modules $IMAP_PROXY_MODULE" + IMAP_SRCS="$IMAP_SRCS $IMAP_PROXY_SRCS" fi diff --git a/auto/sources b/auto/sources index e597f9732..05889f31c 100644 --- a/auto/sources +++ b/auto/sources @@ -339,8 +339,15 @@ IMAP_INCS="src/imap" IMAP_DEPS="src/imap/ngx_imap.h" -IMAP_MODULE=ngx_imap_module +IMAP_MODULES="ngx_imap_module ngx_imap_core_module" + IMAP_SRCS="src/imap/ngx_imap.c \ + src/imap/ngx_imap_core_module.c \ src/imap/ngx_imap_handler.c \ - src/imap/ngx_imap_parse.c \ - src/imap/ngx_imap_proxy.c" + src/imap/ngx_imap_parse.c" + +IMAP_AUTH_HTTP_MODULE="ngx_imap_auth_http_module" +IMAP_AUTH_HTTP_SRCS="src/imap/ngx_imap_auth_http_module.c" + +IMAP_PROXY_MODULE="ngx_imap_proxy_module" +IMAP_PROXY_SRCS="src/imap/ngx_imap_proxy_module.c" |