186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

now we default to LuaJIT instead of the standard Lua 5.1 interpreter.

This commit is contained in:
Yichun Zhang (agentzh) 2014-01-09 22:02:49 -08:00
parent 9a3e9dbffd
commit 1c9f799fa6
3 changed files with 574 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

852
t/sanity.t
View File

File diff suppressed because it is too large Load Diff

14
util/configure vendored
View File

@ -150,7 +150,10 @@ for my $opt (@ARGV) {
$prefix = $1; $prefix = $1;
} elsif ($opt eq '--without-lua51') { } elsif ($opt eq '--without-lua51') {
$resty_opts{no_lua} = 1; undef $resty_opts{lua};
} elsif ($opt eq '--with-lua51') {
$resty_opts{lua} = 1;
} elsif ($opt =~ /^--with-lua51=(.*)/) { } elsif ($opt =~ /^--with-lua51=(.*)/) {
$resty_opts{lua_path} = $1; $resty_opts{lua_path} = $1;
@ -394,11 +397,12 @@ _END_
} }
} }
if (! $opts->{luajit} && ! $opts->{luajit_path} if (!$opts->{lua}
&& ! $opts->{no_http_lua} && ! $opts->{no_lua} && !$opts->{lua_path}
&& ! $opts->{lua_path}) && !$opts->{no_http_lua}
&& !$opts->{luajit_path})
{ {
$opts->{lua} = 1; $opts->{luajit} = 1;
} }
if ($opts->{luajit} && $opts->{luajit_path}) { if ($opts->{luajit} && $opts->{luajit_path}) {

3
util/dist-check
View File

@ -33,10 +33,11 @@ my $cfg_opts = "--with-http_iconv_module";
if ($opts{l}) { if ($opts{l}) {
$lua = 'Lua'; $lua = 'Lua';
$cfg_opts .= " --with-lua51";
} else { } else {
$lua = 'LuaJIT'; $lua = 'LuaJIT';
$cfg_opts .= " --with-luajit"; #$cfg_opts .= " --with-luajit";
} }
if ($^O eq 'solaris') { if ($^O eq 'solaris') {