diff options
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/pcre/makefile.bcc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 2 | ||||
| -rw-r--r-- | auto/make | 13 | ||||
| -rw-r--r-- | auto/os/conf | 2 | ||||
| -rw-r--r-- | auto/sources | 1 |
5 files changed, 16 insertions, 4 deletions
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc index a2dc5fbfc..9fd821d64 100644 --- a/auto/lib/pcre/makefile.bcc +++ b/auto/lib/pcre/makefile.bcc @@ -2,7 +2,7 @@ # Copyright (C) Igor Sysoev -CFLAGS = -q -O2 -tWM $(CPU_OPT) +CFLAGS = -q -O2 -tWM -w-8004 $(CPU_OPT) PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc index 2c764242c..2e7b71991 100644 --- a/auto/lib/zlib/makefile.bcc +++ b/auto/lib/zlib/makefile.bcc @@ -2,7 +2,7 @@ # Copyright (C) Igor Sysoev -CFLAGS = -q -O2 -tWM $(CPU_OPT) +CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT) zlib.lib: bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \ @@ -320,6 +320,19 @@ END fi +# the addons config.make + +if test -n "$NGX_ADDONS"; then + + for ngx_addon_dir in $NGX_ADDONS + do + if test -f $ngx_addon_dir/config.make; then + . $ngx_addon_dir/config.make + fi + done +fi + + # Win32 resource file if test -n "$NGX_RES"; then diff --git a/auto/os/conf b/auto/os/conf index 0ddbacbee..16a3718c9 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -64,7 +64,7 @@ case "$NGX_MACHINE" in NGX_MACH_CACHE_LINE=32 ;; - amd64) + amd64 | x86_64) have=NGX_HAVE_NONALIGNED . auto/have NGX_MACH_CACHE_LINE=64 ;; diff --git a/auto/sources b/auto/sources index 5eacc1ae2..b59808313 100644 --- a/auto/sources +++ b/auto/sources @@ -266,7 +266,6 @@ HTTP_DEPS="src/http/ngx_http.h \ HTTP_SRCS="src/http/ngx_http.c \ src/http/ngx_http_core_module.c \ - src/http/ngx_http_config.c \ src/http/ngx_http_special_response.c \ src/http/ngx_http_request.c \ src/http/ngx_http_parse.c \ |