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

fixed auto_complate and upgraded various modules.

Browse Source
This commit is contained in:
agentzh (章亦春)
2011-03-07 19:32:13 +08:00
parent e9d01174a0
commit 2a2a5f444d
3 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/configure vendored
View File

@ -26,7 +26,7 @@ my @modules = (
[http_encrypted_session => 'encrypted-session-nginx-module'],
[http_drizzle => 'drizzle-nginx-module'],
[http_postgres => 'drizzle-nginx-module', 'disabled'],
[http_lua => 'lua-nginx-module'],
[http_lua => 'ngx_lua'],
[http_headers_more => 'headers-more-nginx-module'],
[http_srcache => 'srcache-nginx-module'],
[http_array_var => 'array-var-nginx-module'],
@ -95,14 +95,14 @@ for my $opt (@ARGV) {
push @ngx_ld_opts, $1;
} elsif ($opt =~ $without_resty_mods_regex) {
die "No $1\n";
$resty_opts{"no_http_$1"} = 1;
#die "no_$1\n";
$resty_opts{"no_$1"} = 1;
} elsif ($opt eq '--without-ngx_devel_kit_module') {
$resty_opts{no_ndk} = 1;
} elsif ($opt =~ $with_resty_mods_regex) {
$resty_opts{"http_$1"} = 1;
$resty_opts{"$1"} = 1;
} elsif ($opt eq '--with-luajit') {
$resty_opts{luajit} = 1;
@ -173,7 +173,7 @@ sub shell ($@) {
sub auto_complete ($) {
my $name = shift;
my @dirs = glob "$name-*" or
my @dirs = glob "$name-[0-9]*" or
die "No source directory found for $name\n";
if (@dirs > 1) {
@ -309,7 +309,7 @@ sub build_resty_opts {
} elsif ($opts->{lua}) {
# build stdandard lua
my $lua_src = glob('lua-5.*');
my $lua_src = auto_complete 'lua';
if (!defined $lua_src) {
die "No lua5 found";

2
util/mirror-tarballs
View File

@ -83,7 +83,7 @@ mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
ver=0.1.6rc2
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
mv chaoslawful-lua-nginx-module-* lua-nginx-module-$ver || exit 1
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
#################################