comparison auto/options @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 4d3e880ce86c
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
50 50
51 NGX_HTTP_LOG_PATH= 51 NGX_HTTP_LOG_PATH=
52 NGX_HTTP_CLIENT_TEMP_PATH= 52 NGX_HTTP_CLIENT_TEMP_PATH=
53 NGX_HTTP_PROXY_TEMP_PATH= 53 NGX_HTTP_PROXY_TEMP_PATH=
54 NGX_HTTP_FASTCGI_TEMP_PATH= 54 NGX_HTTP_FASTCGI_TEMP_PATH=
55 NGX_HTTP_UWSGI_TEMP_PATH=
56 NGX_HTTP_SCGI_TEMP_PATH=
55 57
56 HTTP_CACHE=YES 58 HTTP_CACHE=YES
57 HTTP_CHARSET=YES 59 HTTP_CHARSET=YES
58 HTTP_GZIP=YES 60 HTTP_GZIP=YES
59 HTTP_SSL=NO 61 HTTP_SSL=NO
72 HTTP_RANDOM_INDEX=NO 74 HTTP_RANDOM_INDEX=NO
73 HTTP_STATUS=NO 75 HTTP_STATUS=NO
74 HTTP_GEO=YES 76 HTTP_GEO=YES
75 HTTP_GEOIP=NO 77 HTTP_GEOIP=NO
76 HTTP_MAP=YES 78 HTTP_MAP=YES
79 HTTP_SPLIT_CLIENTS=YES
77 HTTP_REFERER=YES 80 HTTP_REFERER=YES
78 HTTP_REWRITE=YES 81 HTTP_REWRITE=YES
79 HTTP_PROXY=YES 82 HTTP_PROXY=YES
80 HTTP_FASTCGI=YES 83 HTTP_FASTCGI=YES
84 HTTP_UWSGI=YES
85 HTTP_SCGI=YES
81 HTTP_PERL=NO 86 HTTP_PERL=NO
82 HTTP_MEMCACHED=YES 87 HTTP_MEMCACHED=YES
83 HTTP_LIMIT_ZONE=YES 88 HTTP_LIMIT_ZONE=YES
84 HTTP_LIMIT_REQ=YES 89 HTTP_LIMIT_REQ=YES
85 HTTP_EMPTY_GIF=YES 90 HTTP_EMPTY_GIF=YES
86 HTTP_BROWSER=YES 91 HTTP_BROWSER=YES
87 HTTP_SECURE_LINK=NO 92 HTTP_SECURE_LINK=NO
93 HTTP_DEGRADATION=NO
88 HTTP_FLV=NO 94 HTTP_FLV=NO
89 HTTP_GZIP_STATIC=NO 95 HTTP_GZIP_STATIC=NO
90 HTTP_UPSTREAM_IP_HASH=YES 96 HTTP_UPSTREAM_IP_HASH=YES
91 97
92 # STUB 98 # STUB
128 USE_LIBXSLT=NO 134 USE_LIBXSLT=NO
129 USE_LIBGD=NO 135 USE_LIBGD=NO
130 136
131 NGX_GOOGLE_PERFTOOLS=NO 137 NGX_GOOGLE_PERFTOOLS=NO
132 NGX_CPP_TEST=NO 138 NGX_CPP_TEST=NO
139
140 NGX_LIBATOMIC=NO
133 141
134 NGX_CPU_CACHE_LINE= 142 NGX_CPU_CACHE_LINE=
135 143
136 opt= 144 opt=
137 145
179 187
180 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;; 188 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;;
181 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;; 189 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;;
182 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;; 190 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;;
183 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;; 191 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;;
192 --http-uwsgi-temp-path=*) NGX_HTTP_UWSGI_TEMP_PATH="$value" ;;
193 --http-scgi-temp-path=*) NGX_HTTP_SCGI_TEMP_PATH="$value" ;;
184 194
185 --with-http_ssl_module) HTTP_SSL=YES ;; 195 --with-http_ssl_module) HTTP_SSL=YES ;;
186 --with-http_realip_module) HTTP_REALIP=YES ;; 196 --with-http_realip_module) HTTP_REALIP=YES ;;
187 --with-http_addition_module) HTTP_ADDITION=YES ;; 197 --with-http_addition_module) HTTP_ADDITION=YES ;;
188 --with-http_xslt_module) HTTP_XSLT=YES ;; 198 --with-http_xslt_module) HTTP_XSLT=YES ;;
192 --with-http_dav_module) HTTP_DAV=YES ;; 202 --with-http_dav_module) HTTP_DAV=YES ;;
193 --with-http_flv_module) HTTP_FLV=YES ;; 203 --with-http_flv_module) HTTP_FLV=YES ;;
194 --with-http_gzip_static_module) HTTP_GZIP_STATIC=YES ;; 204 --with-http_gzip_static_module) HTTP_GZIP_STATIC=YES ;;
195 --with-http_random_index_module) HTTP_RANDOM_INDEX=YES ;; 205 --with-http_random_index_module) HTTP_RANDOM_INDEX=YES ;;
196 --with-http_secure_link_module) HTTP_SECURE_LINK=YES ;; 206 --with-http_secure_link_module) HTTP_SECURE_LINK=YES ;;
207 --with-http_degradation_module) HTTP_DEGRADATION=YES ;;
197 208
198 --without-http_charset_module) HTTP_CHARSET=NO ;; 209 --without-http_charset_module) HTTP_CHARSET=NO ;;
199 --without-http_gzip_module) HTTP_GZIP=NO ;; 210 --without-http_gzip_module) HTTP_GZIP=NO ;;
200 --without-http_ssi_module) HTTP_SSI=NO ;; 211 --without-http_ssi_module) HTTP_SSI=NO ;;
201 --without-http_userid_module) HTTP_USERID=NO ;; 212 --without-http_userid_module) HTTP_USERID=NO ;;
203 --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO ;; 214 --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO ;;
204 --without-http_autoindex_module) HTTP_AUTOINDEX=NO ;; 215 --without-http_autoindex_module) HTTP_AUTOINDEX=NO ;;
205 --without-http_status_module) HTTP_STATUS=NO ;; 216 --without-http_status_module) HTTP_STATUS=NO ;;
206 --without-http_geo_module) HTTP_GEO=NO ;; 217 --without-http_geo_module) HTTP_GEO=NO ;;
207 --without-http_map_module) HTTP_MAP=NO ;; 218 --without-http_map_module) HTTP_MAP=NO ;;
219 --without-http_split_clients_module) HTTP_SPLIT_CLIENTS=NO ;;
208 --without-http_referer_module) HTTP_REFERER=NO ;; 220 --without-http_referer_module) HTTP_REFERER=NO ;;
209 --without-http_rewrite_module) HTTP_REWRITE=NO ;; 221 --without-http_rewrite_module) HTTP_REWRITE=NO ;;
210 --without-http_proxy_module) HTTP_PROXY=NO ;; 222 --without-http_proxy_module) HTTP_PROXY=NO ;;
211 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;; 223 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;;
224 --without-http_uwsgi_module) HTTP_UWSGI=NO ;;
225 --without-http_scgi_module) HTTP_SCGI=NO ;;
212 --without-http_memcached_module) HTTP_MEMCACHED=NO ;; 226 --without-http_memcached_module) HTTP_MEMCACHED=NO ;;
213 --without-http_limit_zone_module) HTTP_LIMIT_ZONE=NO ;; 227 --without-http_limit_zone_module) HTTP_LIMIT_ZONE=NO ;;
214 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; 228 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;;
215 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; 229 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;;
216 --without-http_browser_module) HTTP_BROWSER=NO ;; 230 --without-http_browser_module) HTTP_BROWSER=NO ;;
261 --with-sha1-asm) SHA1_ASM=YES ;; 275 --with-sha1-asm) SHA1_ASM=YES ;;
262 276
263 --with-zlib=*) ZLIB="$value" ;; 277 --with-zlib=*) ZLIB="$value" ;;
264 --with-zlib-opt=*) ZLIB_OPT="$value" ;; 278 --with-zlib-opt=*) ZLIB_OPT="$value" ;;
265 --with-zlib-asm=*) ZLIB_ASM="$value" ;; 279 --with-zlib-asm=*) ZLIB_ASM="$value" ;;
280
281 --with-libatomic) NGX_LIBATOMIC=YES ;;
282 --with-libatomic=*) NGX_LIBATOMIC="$value" ;;
266 283
267 --test-build-devpoll) NGX_TEST_BUILD_DEVPOLL=YES ;; 284 --test-build-devpoll) NGX_TEST_BUILD_DEVPOLL=YES ;;
268 --test-build-eventport) NGX_TEST_BUILD_EVENTPORT=YES ;; 285 --test-build-eventport) NGX_TEST_BUILD_EVENTPORT=YES ;;
269 --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; 286 --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;;
270 --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;; 287 --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;;
320 --with-http_dav_module enable ngx_http_dav_module 337 --with-http_dav_module enable ngx_http_dav_module
321 --with-http_flv_module enable ngx_http_flv_module 338 --with-http_flv_module enable ngx_http_flv_module
322 --with-http_gzip_static_module enable ngx_http_gzip_static_module 339 --with-http_gzip_static_module enable ngx_http_gzip_static_module
323 --with-http_random_index_module enable ngx_http_random_index_module 340 --with-http_random_index_module enable ngx_http_random_index_module
324 --with-http_secure_link_module enable ngx_http_secure_link_module 341 --with-http_secure_link_module enable ngx_http_secure_link_module
342 --with-http_degradation_module enable ngx_http_degradation_module
325 --with-http_stub_status_module enable ngx_http_stub_status_module 343 --with-http_stub_status_module enable ngx_http_stub_status_module
326 344
327 --without-http_charset_module disable ngx_http_charset_module 345 --without-http_charset_module disable ngx_http_charset_module
328 --without-http_gzip_module disable ngx_http_gzip_module 346 --without-http_gzip_module disable ngx_http_gzip_module
329 --without-http_ssi_module disable ngx_http_ssi_module 347 --without-http_ssi_module disable ngx_http_ssi_module
331 --without-http_access_module disable ngx_http_access_module 349 --without-http_access_module disable ngx_http_access_module
332 --without-http_auth_basic_module disable ngx_http_auth_basic_module 350 --without-http_auth_basic_module disable ngx_http_auth_basic_module
333 --without-http_autoindex_module disable ngx_http_autoindex_module 351 --without-http_autoindex_module disable ngx_http_autoindex_module
334 --without-http_geo_module disable ngx_http_geo_module 352 --without-http_geo_module disable ngx_http_geo_module
335 --without-http_map_module disable ngx_http_map_module 353 --without-http_map_module disable ngx_http_map_module
354 --without-http_split_clients_module disable ngx_http_split_clients_module
336 --without-http_referer_module disable ngx_http_referer_module 355 --without-http_referer_module disable ngx_http_referer_module
337 --without-http_rewrite_module disable ngx_http_rewrite_module 356 --without-http_rewrite_module disable ngx_http_rewrite_module
338 --without-http_proxy_module disable ngx_http_proxy_module 357 --without-http_proxy_module disable ngx_http_proxy_module
339 --without-http_fastcgi_module disable ngx_http_fastcgi_module 358 --without-http_fastcgi_module disable ngx_http_fastcgi_module
359 --without-http_uwsgi_module disable ngx_http_uwsgi_module
360 --without-http_scgi_module disable ngx_http_scgi_module
340 --without-http_memcached_module disable ngx_http_memcached_module 361 --without-http_memcached_module disable ngx_http_memcached_module
341 --without-http_limit_zone_module disable ngx_http_limit_zone_module 362 --without-http_limit_zone_module disable ngx_http_limit_zone_module
342 --without-http_limit_req_module disable ngx_http_limit_req_module 363 --without-http_limit_req_module disable ngx_http_limit_req_module
343 --without-http_empty_gif_module disable ngx_http_empty_gif_module 364 --without-http_empty_gif_module disable ngx_http_empty_gif_module
344 --without-http_browser_module disable ngx_http_browser_module 365 --without-http_browser_module disable ngx_http_browser_module
353 --http-client-body-temp-path=PATH set path to the http client request body 374 --http-client-body-temp-path=PATH set path to the http client request body
354 temporary files 375 temporary files
355 --http-proxy-temp-path=PATH set path to the http proxy temporary files 376 --http-proxy-temp-path=PATH set path to the http proxy temporary files
356 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary 377 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary
357 files 378 files
379 --http-uwsgi-temp-path=PATH set path to the http uwsgi temporary files
380 --http-scgi-temp-path=PATH set path to the http scgi temporary files
358 381
359 --without-http disable HTTP server 382 --without-http disable HTTP server
360 --without-http-cache disable HTTP cache 383 --without-http-cache disable HTTP cache
361 384
362 --with-mail enable POP3/IMAP4/SMTP proxy module 385 --with-mail enable POP3/IMAP4/SMTP proxy module
394 --with-zlib=DIR set path to zlib library sources 417 --with-zlib=DIR set path to zlib library sources
395 --with-zlib-opt=OPTIONS set additional options for zlib building 418 --with-zlib-opt=OPTIONS set additional options for zlib building
396 --with-zlib-asm=CPU use zlib assembler sources optimized 419 --with-zlib-asm=CPU use zlib assembler sources optimized
397 for specified CPU, the valid values: 420 for specified CPU, the valid values:
398 pentium, pentiumpro 421 pentium, pentiumpro
422
423 --with-libatomic force libatomic_ops library usage
424 --with-libatomic=DIR set path to libatomic_ops library sources
399 425
400 --with-openssl=DIR set path to OpenSSL library sources 426 --with-openssl=DIR set path to OpenSSL library sources
401 --with-openssl-opt=OPTIONS set additional options for OpenSSL building 427 --with-openssl-opt=OPTIONS set additional options for OpenSSL building
402 428
403 --with-debug enable the debugging logging 429 --with-debug enable the debugging logging
439 465
440 NGX_HTTP_LOG_PATH=${NGX_HTTP_LOG_PATH:-logs/access.log} 466 NGX_HTTP_LOG_PATH=${NGX_HTTP_LOG_PATH:-logs/access.log}
441 NGX_HTTP_CLIENT_TEMP_PATH=${NGX_HTTP_CLIENT_TEMP_PATH:-client_body_temp} 467 NGX_HTTP_CLIENT_TEMP_PATH=${NGX_HTTP_CLIENT_TEMP_PATH:-client_body_temp}
442 NGX_HTTP_PROXY_TEMP_PATH=${NGX_HTTP_PROXY_TEMP_PATH:-proxy_temp} 468 NGX_HTTP_PROXY_TEMP_PATH=${NGX_HTTP_PROXY_TEMP_PATH:-proxy_temp}
443 NGX_HTTP_FASTCGI_TEMP_PATH=${NGX_HTTP_FASTCGI_TEMP_PATH:-fastcgi_temp} 469 NGX_HTTP_FASTCGI_TEMP_PATH=${NGX_HTTP_FASTCGI_TEMP_PATH:-fastcgi_temp}
470 NGX_HTTP_UWSGI_TEMP_PATH=${NGX_HTTP_UWSGI_TEMP_PATH:-uwsgi_temp}
471 NGX_HTTP_SCGI_TEMP_PATH=${NGX_HTTP_SCGI_TEMP_PATH:-scgi_temp}
444 472
445 case ".$NGX_PERL_MODULES" in 473 case ".$NGX_PERL_MODULES" in
446 ./*) 474 ./*)
447 ;; 475 ;;
448 476