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

now we enable ngx_http_ssl_module by default and we also enable ngx_set_misc by default.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-03-07 01:22:16 +08:00
parent bf6c7ba404
commit 8d2fd89284
3 changed files with 83 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
util/configure vendored
View File

@ -16,6 +16,7 @@ my @modules = (
[http_echo => 'echo-nginx-module'],
[http_xss => 'xss-nginx-module'],
[ndk => 'ngx_devel_kit'],
[http_set_misc => 'set-misc-nginx-module'],
[http_form_input => 'form-input-nginx-module'],
[http_encrypted_session => 'encrypted-session-nginx-module'],
[http_drizzle => 'drizzle-nginx-module'],
@ -111,27 +112,11 @@ for my $opt (@ARGV) {
my $ngx_prefix = "$prefix/nginx";
my $cmd = "./configure --prefix=$ngx_prefix"
. " --with-ld-opt='-Wl,-rpath=$ngx_prefix/lib'"
. " \\\n --with-ld-opt='-Wl,-rpath=$prefix/lib'"
. build_resty_opts(\%resty_opts)
. (@ngx_opts ? " " . join(" ", @ngx_opts) : "");
. (@ngx_opts ? " \\\n " . join(" ", @ngx_opts) : "");
;
if (-d 'build') {
system("rm -rf build");
}
if (-f 'build') {
die "build/ directory already exists\n";
}
shell "cp -r bundle/ build/";
cd 'build';
my $ngx_dir = auto_complete "nginx";
cd $ngx_dir;
if ($dry_run) {
print "$cmd\n";
exit 0;
@ -187,12 +172,47 @@ sub build_resty_opts {
die "--with-http_ssl_module conflicts with --without-http_ssl_module\n";
}
if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
$resty_opts{http_ssl} = 1;
push @ngx_opts, '--with-http_ssl_module';
}
my $opts_line = '';
if ($resty_opts{debug}) {
$opts_line .= " --with-cc-opt='-O0' --with-debug";
$opts_line .= " \\\n --with-cc-opt='-O0' \\\n --with-debug";
} else {
$opts_line .= " --with-cc-opt='-O2'";
$opts_line .= " \\\n --with-cc-opt='-O2'";
}
if (-d 'build') {
system("rm -rf build");
}
if (-f 'build') {
die "build/ directory already exists\n";
}
shell "cp -r bundle/ build/";
cd 'build';
my $ngx_dir = auto_complete "nginx";
cd $ngx_dir;
for my $mod (@modules) {
my ($name, $prefix, $attr) = @$mod;
if ($attr && $attr eq 'disabled') {
next if not $resty_opts{"$name"};
} else {
next if $resty_opts{"no_$name"};
}
my $dir = auto_complete "../$prefix";
$opts_line .= " \\\n --add-module=$dir";
}
return $opts_line;