configure: now supports the --without-stream_ssl_module option to

disable ngx_stream_ssl_module if necessary. fixes #388.
pull/389/head
Datong Sun 7 years ago
parent 0263f89bff
commit 2651aa7870
No known key found for this signature in database
GPG Key ID: 1908AE626BFCE242

20
util/configure vendored

@ -287,6 +287,13 @@ for my $opt (@ARGV) {
$resty_opts{no_http_ssl} = 1; $resty_opts{no_http_ssl} = 1;
$resty_opts{no_http_encrypted_session} = 1; $resty_opts{no_http_encrypted_session} = 1;
} elsif ($opt eq '--with-stream_ssl_module') {
$resty_opts{stream_ssl} = 1;
push @ngx_opts, $opt;
} elsif ($opt eq '--without-stream_ssl_module') {
$resty_opts{no_stream_ssl} = 1;
} elsif ($opt =~ /^--add-module=(.*)/) { } elsif ($opt =~ /^--add-module=(.*)/) {
my $mod_path = File::Spec->rel2abs($1); my $mod_path = File::Spec->rel2abs($1);
@ -488,7 +495,17 @@ _END_
} }
if (!$opts->{no_stream_lua}) { if (!$opts->{no_stream_lua}) {
push @ngx_opts, '--with-stream', '--with-stream_ssl_module'; push @ngx_opts, '--with-stream';
}
if ($opts->{no_stream_ssl} && $opts->{http_stream}) {
die "--with-stream_ssl_module conflicts with --without-stream_ssl_module.",
"\n";
}
if (! $opts->{no_stream_ssl} && ! $opts->{stream_ssl}) {
$opts->{stream_ssl} = 1;
push @ngx_opts, '--with-stream_ssl_module';
} }
if (!$opts->{lua} if (!$opts->{lua}
@ -1234,6 +1251,7 @@ _EOC_
$msg .= <<'_EOC_'; $msg .= <<'_EOC_';
--without-ngx_devel_kit_module disable ngx_devel_kit_module --without-ngx_devel_kit_module disable ngx_devel_kit_module
--without-http_ssl_module disable ngx_http_ssl_module --without-http_ssl_module disable ngx_http_ssl_module
--without-stream_ssl_module disable ngx_stream_ssl_module
_EOC_ _EOC_

Loading…
Cancel
Save