diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-11-12 17:57:57 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-11-12 17:57:57 +0000 |
| commit | 745c7d9c8e60cb08b369c85ee9fee0ec684701b3 (patch) | |
| tree | ad5f60fec837d9037ed3aaa19a60c4043166bf72 | |
| parent | 41bdb0f93d059238c9a2987858f19047ebf87bc3 (diff) | |
| download | nginx-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).
| -rw-r--r-- | auto/lib/perl/conf | 10 | ||||
| -rw-r--r-- | auto/options | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/auto/lib/perl/conf b/auto/lib/perl/conf index 52c7084e9..5ce6c91e6 100644 --- a/auto/lib/perl/conf +++ b/auto/lib/perl/conf @@ -12,7 +12,7 @@ NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \ if test -n "$NGX_PERL_VER"; then echo " + perl version: $NGX_PERL_VER" - if [ "`echo 'use 5.006001; print "OK"' | $NGX_PERL 2>&1`" != OK ]; then + if [ "`$NGX_PERL -e 'use 5.006001; print "OK"'`" != "OK" ]; then echo echo "$0: error: perl 5.6.1 or higher is required" echo @@ -20,6 +20,14 @@ if test -n "$NGX_PERL_VER"; then exit 1; fi + if [ "`$NGX_PERL -MExtUtils::Embed -e 'print "OK"'`" != "OK" ]; then + echo + echo "$0: error: perl module ExtUtils::Embed is required" + echo + + exit 1; + fi + NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`" NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts` 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 |