diff options
| author |   robert <robert@openbsd.org> | 2012-11-14 21:35:00 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-11-14 21:35:00 +0000 |
| commit | 42bdae40dcaec1c21a23c24121dbdd98a26ba542 (patch) | |
| tree | f419dc7c2442b03afd9dd3e4c0ceaf685aa1849c /usr.sbin/nginx/auto | |
| parent | Do not bother reloading r1 from the stack in the epilogue, if it has not been (diff) | |
| download | wireguard-openbsd-42bdae40dcaec1c21a23c24121dbdd98a26ba542.tar.xz wireguard-openbsd-42bdae40dcaec1c21a23c24121dbdd98a26ba542.zip | |
update to 1.2.5
Diffstat (limited to 'usr.sbin/nginx/auto')
| -rw-r--r-- | usr.sbin/nginx/auto/lib/perl/conf | 10 | ||||
| -rw-r--r-- | usr.sbin/nginx/auto/make | 6 | ||||
| -rw-r--r-- | usr.sbin/nginx/auto/options | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/usr.sbin/nginx/auto/lib/perl/conf b/usr.sbin/nginx/auto/lib/perl/conf index 52c7084e974..5ce6c91e613 100644 --- a/usr.sbin/nginx/auto/lib/perl/conf +++ b/usr.sbin/nginx/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/usr.sbin/nginx/auto/make b/usr.sbin/nginx/auto/make index 23d6a1ce172..7923d789e3f 100644 --- a/usr.sbin/nginx/auto/make +++ b/usr.sbin/nginx/auto/make @@ -50,7 +50,7 @@ END ngx_all_srcs="$CORE_SRCS" -# the core dependences and include pathes +# the core dependences and include paths ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \ | sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \ @@ -70,7 +70,7 @@ CORE_INCS = $ngx_include_opt$ngx_incs END -# the http dependences and include pathes +# the http dependences and include paths if [ $HTTP = YES ]; then @@ -96,7 +96,7 @@ END fi -# the mail dependences and include pathes +# the mail dependences and include paths if [ $MAIL = YES ]; then diff --git a/usr.sbin/nginx/auto/options b/usr.sbin/nginx/auto/options index 11f23c6d64c..6c3a4db9742 100644 --- a/usr.sbin/nginx/auto/options +++ b/usr.sbin/nginx/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 |