186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

configure: now supports the --without-stream_ssl_module option to disable ngx_stream_ssl_module if necessary.

Browse Source 
Fix #388.
This commit is contained in:
Datong Sun
2018-07-05 13:53:49 -07:00
committed by Yichun Zhang (agentzh)
parent 0263f89bff
commit 34db6fd04c
3 changed files with 82 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
util/configure vendored
View File

@ -287,6 +287,13 @@ for my $opt (@ARGV) {
$resty_opts{no_http_ssl} = 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=(.*)/) {
my $mod_path = File::Spec->rel2abs($1);
@ -488,7 +495,17 @@ _END_
}
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->{stream_ssl}) {
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}
@ -1234,6 +1251,7 @@ _EOC_
$msg .= <<'_EOC_';
--without-ngx_devel_kit_module disable ngx_devel_kit_module
--without-http_ssl_module disable ngx_http_ssl_module
--without-stream_ssl_module disable ngx_stream_ssl_module
_EOC_