Author: mdounin
Date: 2012-11-12 17:57:57 +0000 (Mon, 12 Nov 2012)
New Revision: 4901
URL: http://trac.nginx.org/nginx/changeset/4901/nginx

Log:
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).


Modified:
branches/stable-1.2/
branches/stable-1.2/auto/lib/perl/conf
branches/stable-1.2/auto/options

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-11-12 17:54:49 UTC (rev 4900)
+++ branches/stable-1.2 2012-11-12 17:57:57 UTC (rev 4901)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4867
\ No newline at end of property
Modified: branches/stable-1.2/auto/lib/perl/conf
===================================================================
--- branches/stable-1.2/auto/lib/perl/conf 2012-11-12 17:54:49 UTC (rev 4900)
+++ branches/stable-1.2/auto/lib/perl/conf 2012-11-12 17:57:57 UTC (rev 4901)
@@ -12,7 +12,7 @@
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 @@
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`


Modified: branches/stable-1.2/auto/options
===================================================================
--- branches/stable-1.2/auto/options 2012-11-12 17:54:49 UTC (rev 4900)
+++ branches/stable-1.2/auto/options 2012-11-12 17:57:57 UTC (rev 4901)
@@ -385,6 +385,10 @@
--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

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel