diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-06-22 20:43:09 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-06-22 20:43:09 +0400 |
| commit | 3d5c0fc89e6a5e572e9e3071bd632cbc41b1f8d0 (patch) | |
| tree | 38e5ffa627c505024b0eaf1f8d5924bff4e35902 /auto | |
| parent | b14169a714bb3deeb7f4912a58238f7a54aeecd1 (diff) | |
nginx-0.0.7-2004-06-22-20:43:09 import
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 23 | ||||
| -rw-r--r-- | auto/options | 2 | ||||
| -rw-r--r-- | auto/sources | 6 |
3 files changed, 20 insertions, 11 deletions
diff --git a/auto/modules b/auto/modules index 68d6eed05..a2dccc88e 100644 --- a/auto/modules +++ b/auto/modules @@ -43,16 +43,12 @@ fi HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES \ $HTTP_CHUNKED_FILTER_MODULE \ - $HTTP_RANGE_HEADER_FILTER_MODULE \ - $HTTP_CHARSET_FILTER_MODULE" + $HTTP_RANGE_HEADER_FILTER_MODULE" -HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE" - -if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then - have=NGX_HTTP_REWRITE . auto/have - USE_PCRE=YES - HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE" - HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS" +if [ $HTTP_CHARSET = YES ]; then + have=NGX_HTTP_CHARSET . auto/have + HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_CHARSET_FILTER_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_CHARSET_SRCS" fi if [ $HTTP_GZIP = YES ]; then @@ -68,6 +64,15 @@ if [ $HTTP_SSI = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_SSI_SRCS" fi +HTTP_MODULES="$HTTP_MODULES $HTTP_STATIC_MODULE $HTTP_INDEX_MODULE" + +if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then + have=NGX_HTTP_REWRITE . auto/have + USE_PCRE=YES + HTTP_MODULES="$HTTP_MODULES $HTTP_REWRITE_MODULE" + HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS" +fi + if [ $HTTP_PROXY = YES ]; then have=NGX_HTTP_PROXY . auto/have USE_MD5=YES diff --git a/auto/options b/auto/options index 8ef6dddbb..7c729d866 100644 --- a/auto/options +++ b/auto/options @@ -29,6 +29,7 @@ EVENT_AIO=NO USE_THREADS=NO +HTTP_CHARSET=YES HTTP_REWRITE=YES HTTP_GZIP=YES HTTP_SSI=YES @@ -80,6 +81,7 @@ do --with-threads=*) USE_THREADS="$value" ;; --with-threads) USE_THREADS="pthreads" ;; + --without-http_charset_module) HTTP_CHARSET=NO ;; --without-http_rewrite_module) HTTP_REWRITE=NO ;; --without-http_ssi_module) HTTP_SSI=NO ;; --without-http_gzip_module) HTTP_GZIP=NO ;; diff --git a/auto/sources b/auto/sources index ba2934a44..a74e28615 100644 --- a/auto/sources +++ b/auto/sources @@ -187,7 +187,6 @@ HTTP_FILTER_MODULES="ngx_http_write_filter_module \ ngx_http_header_filter_module" HTTP_CHUNKED_FILTER_MODULE=ngx_http_chunked_filter_module -HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module HTTP_HEADERS_FILTER_MODULE=ngx_http_headers_filter_module HTTP_COPY_FILTER_MODULE=ngx_http_copy_filter_module @@ -225,7 +224,6 @@ HTTP_SRCS="src/http/ngx_http.c \ src/http/modules/ngx_http_index_handler.c \ src/http/modules/ngx_http_chunked_filter.c \ src/http/modules/ngx_http_range_filter.c \ - src/http/modules/ngx_http_charset_filter.c \ src/http/modules/ngx_http_headers_filter.c \ src/http/modules/ngx_http_not_modified_filter.c" @@ -236,6 +234,10 @@ HTPP_CACHE_SRCS=src/http/ngx_http_cache.c HTPP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c +HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module +HTTP_CHARSET_FILTER_SRCS=src/http/modules/ngx_http_charset_filter.c + + HTTP_REWRITE_MODULE=ngx_http_rewrite_module HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c |