summaryrefslogtreecommitdiffhomepage
path: root/auto/options
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-11-12 17:57:57 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-11-12 17:57:57 +0000
commit745c7d9c8e60cb08b369c85ee9fee0ec684701b3 (patch)
treead5f60fec837d9037ed3aaa19a60c4043166bf72 /auto/options
parent41bdb0f93d059238c9a2987858f19047ebf87bc3 (diff)
downloadnginx-745c7d9c8e60cb08b369c85ee9fee0ec684701b3.tar.gz
nginx-745c7d9c8e60cb08b369c85ee9fee0ec684701b3.tar.bz2
Merge of r4866, r4867: configure fixes.
*) Configure: help updated to list upstream keepalive and least_conn. Patch by Joshua Zhu. *) Configure: additional test for ExtUtils::Embed perl module presence. Now perl configure will correctly fail if ExtUtils::Embed perl module is not present in the system (found on Amazon Linux AMI, as of release 2012.03).
Diffstat (limited to '')
-rw-r--r--auto/options4
1 files changed, 4 insertions, 0 deletions
diff --git a/auto/options b/auto/options
index 11f23c6d6..6c3a4db97 100644
--- a/auto/options
+++ b/auto/options
@@ -385,6 +385,10 @@ cat << END
--without-http_browser_module disable ngx_http_browser_module
--without-http_upstream_ip_hash_module
disable ngx_http_upstream_ip_hash_module
+ --without-http_upstream_least_conn_module
+ disable ngx_http_upstream_least_conn_module
+ --without-http_upstream_keepalive_module
+ disable ngx_http_upstream_keepalive_module
--with-http_perl_module enable ngx_http_perl_module
--with-perl_modules_path=PATH set Perl modules path