comparison auto/options @ 6143:162b2d27d4e1

Configure: handle deprecated options. Removed the deprecated --without-http_limit_zone_module option. Deprecated the --with-imap and --with-imap_ssl_module options.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 29 Apr 2015 14:59:02 +0300
parents adba26ff70b5
children 8807a2369b1a
comparison
equal deleted inserted replaced
6142:53bccdc4923a 6143:162b2d27d4e1
241 --without-http_proxy_module) HTTP_PROXY=NO ;; 241 --without-http_proxy_module) HTTP_PROXY=NO ;;
242 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;; 242 --without-http_fastcgi_module) HTTP_FASTCGI=NO ;;
243 --without-http_uwsgi_module) HTTP_UWSGI=NO ;; 243 --without-http_uwsgi_module) HTTP_UWSGI=NO ;;
244 --without-http_scgi_module) HTTP_SCGI=NO ;; 244 --without-http_scgi_module) HTTP_SCGI=NO ;;
245 --without-http_memcached_module) HTTP_MEMCACHED=NO ;; 245 --without-http_memcached_module) HTTP_MEMCACHED=NO ;;
246 --without-http_limit_zone_module)
247 HTTP_LIMIT_CONN=NO
248 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
249 $0: warning: the \"--without-http_limit_zone_module\" option is deprecated, \
250 use the \"--without-http_limit_conn_module\" option instead"
251 ;;
252 --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;; 246 --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;;
253 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; 247 --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;;
254 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; 248 --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;;
255 --without-http_browser_module) HTTP_BROWSER=NO ;; 249 --without-http_browser_module) HTTP_BROWSER=NO ;;
256 --without-http_upstream_hash_module) HTTP_UPSTREAM_HASH=NO ;; 250 --without-http_upstream_hash_module) HTTP_UPSTREAM_HASH=NO ;;
268 --with-http_stub_status_module) HTTP_STUB_STATUS=YES ;; 262 --with-http_stub_status_module) HTTP_STUB_STATUS=YES ;;
269 263
270 --with-mail) MAIL=YES ;; 264 --with-mail) MAIL=YES ;;
271 --with-mail_ssl_module) MAIL_SSL=YES ;; 265 --with-mail_ssl_module) MAIL_SSL=YES ;;
272 # STUB 266 # STUB
273 --with-imap) MAIL=YES ;; 267 --with-imap)
274 --with-imap_ssl_module) MAIL_SSL=YES ;; 268 MAIL=YES
269 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
270 $0: warning: the \"--with-imap\" option is deprecated, \
271 use the \"--with-mail\" option instead"
272 ;;
273 --with-imap_ssl_module)
274 MAIL_SSL=YES
275 NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
276 $0: warning: the \"--with-imap_ssl_module\" option is deprecated, \
277 use the \"--with-mail_ssl_module\" option instead"
278 ;;
275 --without-mail_pop3_module) MAIL_POP3=NO ;; 279 --without-mail_pop3_module) MAIL_POP3=NO ;;
276 --without-mail_imap_module) MAIL_IMAP=NO ;; 280 --without-mail_imap_module) MAIL_IMAP=NO ;;
277 --without-mail_smtp_module) MAIL_SMTP=NO ;; 281 --without-mail_smtp_module) MAIL_SMTP=NO ;;
278 282
279 --with-stream) STREAM=YES ;; 283 --with-stream) STREAM=YES ;;