diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/cc/bcc | 4 | ||||
| -rw-r--r-- | auto/cc/conf | 6 | ||||
| -rw-r--r-- | auto/cc/icc | 12 | ||||
| -rw-r--r-- | auto/cc/msvc | 8 | ||||
| -rw-r--r-- | auto/make | 12 | ||||
| -rw-r--r-- | auto/modules | 6 | ||||
| -rw-r--r-- | auto/options | 2 | ||||
| -rw-r--r-- | auto/sources | 4 |
8 files changed, 48 insertions, 6 deletions
diff --git a/auto/cc/bcc b/auto/cc/bcc index af108bb21..83b2d60dd 100644 --- a/auto/cc/bcc +++ b/auto/cc/bcc @@ -63,5 +63,9 @@ ngx_binout="-e" ngx_objext="obj" ngx_binext=".exe" +ngx_long_start='@&&| + ' +ngx_long_end='|' + ngx_regex_dirsep='\\' ngx_dirsep="\\" diff --git a/auto/cc/conf b/auto/cc/conf index 37f2d2e42..82854d804 100644 --- a/auto/cc/conf +++ b/auto/cc/conf @@ -11,6 +11,9 @@ ngx_binout="-o " ngx_objext="o" ngx_binext= +ngx_long_start= +ngx_long_end= + ngx_regex_dirsep="\/" ngx_dirsep='/' @@ -22,6 +25,9 @@ ngx_tab=' \ ' ngx_spacer= +ngx_long_regex_cont=$ngx_regex_cont +ngx_long_cont=$ngx_cont + . auto/cc/name if test -n "$CFLAGS"; then diff --git a/auto/cc/icc b/auto/cc/icc index d3a151c6e..6af9713b2 100644 --- a/auto/cc/icc +++ b/auto/cc/icc @@ -38,6 +38,7 @@ CFLAGS="$CFLAGS $IPO" CORE_LINK="$CORE_LINK $IPO" CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" + case $CPU in pentium) # optimize for Pentium and Athlon @@ -104,7 +105,7 @@ CFLAGS="$CFLAGS -wd1418" CFLAGS="$CFLAGS -wd1419" case "$NGX_ICC_VER" in - 8.* | 9.*) + 9.*) # "cc" clobber ignored, warnings for Liunx's htons() CFLAGS="$CFLAGS -wd1469" # explicit conversion of a 64-bit integral type to a smaller @@ -119,6 +120,15 @@ case "$NGX_ICC_VER" in CFLAGS="$CFLAGS -wd1595" ;; + 8.*) + # "cc" clobber ignored, warnings for Liunx's htons() + CFLAGS="$CFLAGS -wd1469" + + # STUB + # non-POD class type passed through ellipsis, Linux only ? + CFLAGS="$CFLAGS -wd1595" + ;; + *) ;; esac diff --git a/auto/cc/msvc b/auto/cc/msvc index 0fa5df9d7..29c40c79b 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -114,5 +114,13 @@ ngx_binout="-Fe" ngx_objext="obj" ngx_binext=".exe" +ngx_long_start='@<< + ' +ngx_long_end='<<' +ngx_long_regex_cont=' \ + ' +ngx_long_cont=' + ' + #ngx_regex_dirsep='\\' #ngx_dirsep="\\" @@ -26,7 +26,9 @@ if [ "$CC" = wcl386 ]; then echo MAKE = wmake >> $NGX_MAKEFILE ngx_regex_cont=' ' + ngx_long_regex_cont=' ' ngx_cont=' ' + ngx_long_cont=' ' ngx_tab=' ' fi @@ -170,22 +172,22 @@ ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $ngx_res $LINK_DEPS \ -e "s/\//$ngx_regex_dirsep/g"` ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \ - | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ + | sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \ -e "s/\//$ngx_regex_dirsep/g"` ngx_libs=${CORE_LIBS:+`echo $NGX_LD_OPT $CORE_LIBS \ - | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`} + | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} ngx_link=${CORE_LINK:+`echo $CORE_LINK \ - | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_regex_cont/"`} + | sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`} cat << END >> $NGX_MAKEFILE $NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer - \$(LINK) ${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_cont$ngx_objs$ngx_libs$ngx_link + \$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link $ngx_rcc - +${ngx_long_end} END diff --git a/auto/modules b/auto/modules index 46f356cc0..26b108761 100644 --- a/auto/modules +++ b/auto/modules @@ -139,6 +139,12 @@ if [ $HTTP_ACCESS = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_ACCESS_SRCS" fi +if [ $HTTP_REALIP = YES ]; then + have=NGX_HTTP_REALIP . auto/have + HTTP_MODULES="$HTTP_MODULES $HTTP_REALIP_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_REALIP_SRCS" +fi + if [ $HTTP_STATUS = YES ]; then have=NGX_HTTP_STATUS . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_STATUS_MODULE" diff --git a/auto/options b/auto/options index 2960f09c3..35c7ad300 100644 --- a/auto/options +++ b/auto/options @@ -50,6 +50,7 @@ HTTP_GZIP=YES HTTP_SSL=NO HTTP_SSI=YES HTTP_POSTPONE=NO +HTTP_REALIP=NO HTTP_ACCESS=YES HTTP_AUTH_BASIC=YES HTTP_USERID=YES @@ -125,6 +126,7 @@ do --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;; --with-http_ssl_module) HTTP_SSL=YES ;; + --with-http_realip_module) HTTP_REALIP=YES ;; --without-http_charset_module) HTTP_CHARSET=NO ;; --without-http_gzip_module) HTTP_GZIP=NO ;; --without-http_ssi_module) HTTP_SSI=NO ;; diff --git a/auto/sources b/auto/sources index c4aec701c..8aa596ca2 100644 --- a/auto/sources +++ b/auto/sources @@ -310,6 +310,10 @@ HTTP_USERID_FILTER_MODULE=ngx_http_userid_filter_module HTTP_USERID_SRCS=src/http/modules/ngx_http_userid_filter_module.c +HTTP_REALIP_MODULE=ngx_http_realip_module +HTTP_REALIP_SRCS=src/http/modules/ngx_http_realip_module.c + + HTTP_ACCESS_MODULE=ngx_http_access_module HTTP_ACCESS_SRCS=src/http/modules/ngx_http_access_module.c |