comparison auto/options @ 410:cd9cb7a3ff9e

Merge with nginx 0.7.8.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Aug 2008 22:07:06 +0400
parents 34fb3a573548
children 05981f639d21
comparison
equal deleted inserted replaced
409:52b28d322d76 410:cd9cb7a3ff9e
54 HTTP_GZIP=YES 54 HTTP_GZIP=YES
55 HTTP_SSL=NO 55 HTTP_SSL=NO
56 HTTP_SSI=YES 56 HTTP_SSI=YES
57 HTTP_POSTPONE=NO 57 HTTP_POSTPONE=NO
58 HTTP_REALIP=NO 58 HTTP_REALIP=NO
59 HTTP_XSLT=NO
59 HTTP_SUB=NO 60 HTTP_SUB=NO
60 HTTP_ADDITION=NO 61 HTTP_ADDITION=NO
61 HTTP_DAV=NO 62 HTTP_DAV=NO
62 HTTP_ACCESS=YES 63 HTTP_ACCESS=YES
63 HTTP_AUTH_BASIC=YES 64 HTTP_AUTH_BASIC=YES
74 HTTP_MEMCACHED=YES 75 HTTP_MEMCACHED=YES
75 HTTP_LIMIT_ZONE=YES 76 HTTP_LIMIT_ZONE=YES
76 HTTP_EMPTY_GIF=YES 77 HTTP_EMPTY_GIF=YES
77 HTTP_BROWSER=YES 78 HTTP_BROWSER=YES
78 HTTP_FLV=NO 79 HTTP_FLV=NO
80 HTTP_GZIP_STATIC=NO
79 HTTP_UPSTREAM_IP_HASH=YES 81 HTTP_UPSTREAM_IP_HASH=YES
80 82
81 # STUB 83 # STUB
82 HTTP_STUB_STATUS=NO 84 HTTP_STUB_STATUS=NO
83 85
111 ZLIB_OPT= 113 ZLIB_OPT=
112 ZLIB_ASM=NO 114 ZLIB_ASM=NO
113 115
114 USE_PERL=NO 116 USE_PERL=NO
115 NGX_PERL=perl 117 NGX_PERL=perl
118
119 USE_LIBXSLT=NO
120
121 NGX_GOOGLE_PERFTOOLS=NO
116 122
117 NGX_CPU_CACHE_LINE= 123 NGX_CPU_CACHE_LINE=
118 124
119 125
120 for option 126 for option
145 --without-select_module) EVENT_SELECT=NONE ;; 151 --without-select_module) EVENT_SELECT=NONE ;;
146 --with-poll_module) EVENT_POLL=YES ;; 152 --with-poll_module) EVENT_POLL=YES ;;
147 --without-poll_module) EVENT_POLL=NONE ;; 153 --without-poll_module) EVENT_POLL=NONE ;;
148 --with-aio_module) EVENT_AIO=YES ;; 154 --with-aio_module) EVENT_AIO=YES ;;
149 155
150 --with-threads=*) USE_THREADS="$value" ;; 156 #--with-threads=*) USE_THREADS="$value" ;;
151 --with-threads) USE_THREADS="pthreads" ;; 157 #--with-threads) USE_THREADS="pthreads" ;;
152 158
153 --without-http) HTTP=NO ;; 159 --without-http) HTTP=NO ;;
154 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;; 160 --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;;
155 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;; 161 --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;;
156 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;; 162 --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;;
157 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;; 163 --http-fastcgi-temp-path=*) NGX_HTTP_FASTCGI_TEMP_PATH="$value" ;;
158 164
159 --with-http_ssl_module) HTTP_SSL=YES ;; 165 --with-http_ssl_module) HTTP_SSL=YES ;;
160 --with-http_realip_module) HTTP_REALIP=YES ;; 166 --with-http_realip_module) HTTP_REALIP=YES ;;
161 --with-http_addition_module) HTTP_ADDITION=YES ;; 167 --with-http_addition_module) HTTP_ADDITION=YES ;;
168 --with-http_xslt_module) HTTP_XSLT=YES ;;
162 --with-http_sub_module) HTTP_SUB=YES ;; 169 --with-http_sub_module) HTTP_SUB=YES ;;
163 --with-http_dav_module) HTTP_DAV=YES ;; 170 --with-http_dav_module) HTTP_DAV=YES ;;
164 --with-http_flv_module) HTTP_FLV=YES ;; 171 --with-http_flv_module) HTTP_FLV=YES ;;
172 --with-http_gzip_static_module) HTTP_GZIP_STATIC=YES ;;
165 173
166 --without-http_charset_module) HTTP_CHARSET=NO ;; 174 --without-http_charset_module) HTTP_CHARSET=NO ;;
167 --without-http_gzip_module) HTTP_GZIP=NO ;; 175 --without-http_gzip_module) HTTP_GZIP=NO ;;
168 --without-http_ssi_module) HTTP_SSI=NO ;; 176 --without-http_ssi_module) HTTP_SSI=NO ;;
169 --without-http_userid_module) HTTP_USERID=NO ;; 177 --without-http_userid_module) HTTP_USERID=NO ;;
197 --with-imap_ssl_module) MAIL_SSL=YES ;; 205 --with-imap_ssl_module) MAIL_SSL=YES ;;
198 --without-mail_pop3_module) MAIL_POP3=NO ;; 206 --without-mail_pop3_module) MAIL_POP3=NO ;;
199 --without-mail_imap_module) MAIL_IMAP=NO ;; 207 --without-mail_imap_module) MAIL_IMAP=NO ;;
200 --without-mail_smtp_module) MAIL_SMTP=NO ;; 208 --without-mail_smtp_module) MAIL_SMTP=NO ;;
201 209
210 --with-google_perftools_module) NGX_GOOGLE_PERFTOOLS=YES ;;
211
202 --add-module=*) NGX_ADDONS="$NGX_ADDONS $value" ;; 212 --add-module=*) NGX_ADDONS="$NGX_ADDONS $value" ;;
203 213
204 --with-cc=*) CC="$value" ;; 214 --with-cc=*) CC="$value" ;;
205 --with-cpp=*) CPP="$value" ;; 215 --with-cpp=*) CPP="$value" ;;
206 --with-cc-opt=*) NGX_CC_OPT="$value" ;; 216 --with-cc-opt=*) NGX_CC_OPT="$value" ;;
268 --without-poll_module disable poll module 278 --without-poll_module disable poll module
269 279
270 --with-http_ssl_module enable ngx_http_ssl_module 280 --with-http_ssl_module enable ngx_http_ssl_module
271 --with-http_realip_module enable ngx_http_realip_module 281 --with-http_realip_module enable ngx_http_realip_module
272 --with-http_addition_module enable ngx_http_addition_module 282 --with-http_addition_module enable ngx_http_addition_module
283 --with-http_xslt_module enable ngx_http_xslt_module
273 --with-http_sub_module enable ngx_http_sub_module 284 --with-http_sub_module enable ngx_http_sub_module
274 --with-http_dav_module enable ngx_http_dav_module 285 --with-http_dav_module enable ngx_http_dav_module
275 --with-http_flv_module enable ngx_http_flv_module 286 --with-http_flv_module enable ngx_http_flv_module
287 --with-http_gzip_static_module enable ngx_http_gzip_static_module
276 --with-http_stub_status_module enable ngx_http_stub_status_module 288 --with-http_stub_status_module enable ngx_http_stub_status_module
277 289
278 --without-http_charset_module disable ngx_http_charset_module 290 --without-http_charset_module disable ngx_http_charset_module
279 --without-http_gzip_module disable ngx_http_gzip_module 291 --without-http_gzip_module disable ngx_http_gzip_module
280 --without-http_ssi_module disable ngx_http_ssi_module 292 --without-http_ssi_module disable ngx_http_ssi_module
306 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary 318 --http-fastcgi-temp-path=PATH set path to the http fastcgi temporary
307 files 319 files
308 320
309 --without-http disable HTTP server 321 --without-http disable HTTP server
310 322
311 --with-mail enable IMAP4/POP3/SMTP proxy module 323 --with-mail enable POP3/IMAP4/SMTP proxy module
312 --with-mail_ssl_module enable ngx_mail_ssl_module 324 --with-mail_ssl_module enable ngx_mail_ssl_module
325 --without-mail_pop3_module disable ngx_mail_pop3_module
326 --without-mail_imap_module disable ngx_mail_imap_module
327 --without-mail_smtp_module disable ngx_mail_smtp_module
328
329 --with-google_perftools_module enable ngx_google_perftools_module
313 330
314 --add-module=PATH enable an external module 331 --add-module=PATH enable an external module
315 332
316 --with-cc=PATH set path to C compiler 333 --with-cc=PATH set path to C compiler
317 --with-cpp=PATH set path to C preprocessor 334 --with-cpp=PATH set path to C preprocessor