configure: removed outdated '--with-luajit' option (always the default).

* keep the option to avoid the script from producing an error - it NOPs.
* removed a dead branch of code since it is now impossible for the
  `luajit` and `luajit_path` options to be both enabled at once.
* update `--help` output to remove mentions of PUC-Rio Lua
pull/628/head
Thibault Charbonnier 3 years ago committed by Yichun Zhang (agentzh)
parent e3615c3522
commit 5a03142ec3
  1. 91
      t/000-sanity.t
  2. 12
      util/configure

@ -2,7 +2,7 @@
use lib '.';
use t::Config;
plan tests => 273;
plan tests => 270;
#no_diff();
@ -21,8 +21,7 @@ __DATA__
--with-no-pool-patch enable the no-pool patch for debugging memory issues
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.1
-jN pass -jN option to make while building LuaJIT 2.1
--without-http_echo_module disable ngx_http_echo_module
--without-http_xss_module disable ngx_http_xss_module
@ -73,12 +72,11 @@ __DATA__
--without-lua_resty_shell disable the lua-resty-shell library
--without-lua_resty_core disable the lua-resty-core library
--with-luajit enable and build the bundled LuaJIT 2.1 (the default)
--with-luajit=DIR use the external LuaJIT 2.1 installation specified by DIR
--with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1
--with-luajit-ldflags=FLAGS Specify extra C linker flags for LuaJIT 2.1
--without-luajit-lua52 Turns off the LuaJIT extensions from Lua 5.2 that may break
backward compatibility.
backward compatibility
--without-luajit-gc64 Turns off the LuaJIT GC64 mode (which is enabled by default
on x86_64)
@ -809,8 +807,7 @@ clean:
--with-no-pool-patch enable the no-pool patch for debugging memory issues
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.1
-jN pass -jN option to make while building LuaJIT 2.1
--without-http_echo_module disable ngx_http_echo_module
--without-http_xss_module disable ngx_http_xss_module
@ -861,12 +858,11 @@ clean:
--without-lua_resty_shell disable the lua-resty-shell library
--without-lua_resty_core disable the lua-resty-core library
--with-luajit enable and build the bundled LuaJIT 2.1 (the default)
--with-luajit=DIR use the external LuaJIT 2.1 installation specified by DIR
--with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1
--with-luajit-ldflags=FLAGS Specify extra C linker flags for LuaJIT 2.1
--without-luajit-lua52 Turns off the LuaJIT extensions from Lua 5.2 that may break
backward compatibility.
backward compatibility
--without-luajit-gc64 Turns off the LuaJIT GC64 mode (which is enabled by default
on x86_64)
@ -1049,7 +1045,6 @@ Options directly inherited from nginx
=== TEST 10: --with-http_drizzle_module on solaris
--- cmd: ./configure --with-http_drizzle_module --dry-run --platform=solaris
--- out
@ -3221,18 +3216,7 @@ clean:
=== TEST 39: --with-luajit & --with-luajit=PATH
--- cmd: ./configure --with-luajit=/tmp/luajit --with-luajit
--- out
platform: linux (linux)
--- err
--with-luajit and --with-luajit=DIR are mutually exclusive.
--- exit: 2
=== TEST 40: ./configure with -jN
=== TEST 39: ./configure with -jN
--- cmd: ./configure --dry-run -j10
--- out
platform: linux (linux)
@ -3320,7 +3304,7 @@ clean:
=== TEST 41: --with-luajit & -jN
=== TEST 40: --with-luajit & -jN
--- cmd: ./configure --with-luajit --dry-run -j5
--- out
platform: linux (linux)
@ -3408,7 +3392,7 @@ clean:
=== TEST 42: relative path as the --add-module option's value
=== TEST 41: relative path as the --add-module option's value
--- cmd: ./configure --add-module=/path/to/some/module --add-module=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -3496,7 +3480,7 @@ clean:
=== TEST 43: relative path as the --with-openssl option's value
=== TEST 42: relative path as the --with-openssl option's value
--- cmd: ./configure --with-openssl=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -3584,7 +3568,7 @@ clean:
=== TEST 44: --without-lua_resty_memcached
=== TEST 43: --without-lua_resty_memcached
--- cmd: ./configure --dry-run --without-lua_resty_memcached
--- out
platform: linux (linux)
@ -3671,7 +3655,7 @@ clean:
=== TEST 45: --without-lua_resty_redis
=== TEST 44: --without-lua_resty_redis
--- cmd: ./configure --dry-run --without-lua_resty_redis
--- out
platform: linux (linux)
@ -3758,7 +3742,7 @@ clean:
=== TEST 46: --with-luajit-xcflags
=== TEST 45: --with-luajit-xcflags
--- cmd: ./configure --with-luajit --with-luajit-xcflags='-DLUAJIT_USE_VALGRIND' --dry-run
--- out
platform: linux (linux)
@ -3846,7 +3830,7 @@ clean:
=== TEST 47: --with-debug & luajit & --with-luajit-xcflags
=== TEST 46: --with-debug & luajit & --with-luajit-xcflags
--- cmd: ./configure --with-luajit --with-debug --dry-run --with-luajit-xcflags='-DLUAJIT_USE_VALGRIND'
--- out
platform: linux (linux)
@ -3935,7 +3919,7 @@ clean:
=== TEST 48: relative path as the --with-pcre option's value
=== TEST 47: relative path as the --with-pcre option's value
--- cmd: ./configure --with-pcre=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -4023,7 +4007,7 @@ clean:
=== TEST 49: relative path as the --with-zlib option's value
=== TEST 48: relative path as the --with-zlib option's value
--- cmd: ./configure --with-zlib=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -4111,7 +4095,7 @@ clean:
=== TEST 50: relative path as the --with-md5 option's value
=== TEST 49: relative path as the --with-md5 option's value
--- cmd: ./configure --with-md5=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -4199,7 +4183,7 @@ clean:
=== TEST 51: relative path as the --with-sha1 option's value
=== TEST 50: relative path as the --with-sha1 option's value
--- cmd: ./configure --with-sha1=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -4287,7 +4271,7 @@ clean:
=== TEST 52: relative path as the --with-libatomic option's value
=== TEST 51: relative path as the --with-libatomic option's value
--- cmd: ./configure --with-libatomic=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -4375,7 +4359,7 @@ clean:
=== TEST 53: --without-lua_resty_dns
=== TEST 52: --without-lua_resty_dns
--- cmd: ./configure --dry-run --without-lua_resty_dns
--- out
platform: linux (linux)
@ -4462,7 +4446,7 @@ clean:
=== TEST 54: --prefix (relative path: "."), lua51
=== TEST 53: --prefix (relative path: "."), lua51
--- cmd: ./configure --prefix=. --dry-run
--- out
platform: linux (linux)
@ -4552,7 +4536,7 @@ clean:
=== TEST 55: --prefix (relative path: "."), luajit
=== TEST 54: --prefix (relative path: "."), luajit
--- cmd: ./configure --prefix=. --dry-run
--- out
platform: linux (linux)
@ -4642,7 +4626,7 @@ clean:
=== TEST 56: --prefix (relative path: ""), luajit
=== TEST 55: --prefix (relative path: ""), luajit
--- cmd: ./configure --prefix= --dry-run
--- out
platform: linux (linux)
@ -4732,7 +4716,7 @@ clean:
=== TEST 57: MSYS platform
=== TEST 56: MSYS platform
--- cmd: ./configure --prefix= --platform=msys --dry-run
--- out
platform: msys (msys)
@ -4820,7 +4804,7 @@ clean:
=== TEST 58: --with-pcre-opt='foo bar'
=== TEST 57: --with-pcre-opt='foo bar'
--- cmd: ./configure --dry-run --with-pcre-opt='-foo -bar' --with-zlib-opt="hello, '\world"
--- out
platform: linux (linux)
@ -4908,7 +4892,7 @@ clean:
=== TEST 59: --with-luajit-xcflags lua 5.2 compat
=== TEST 58: --with-luajit-xcflags lua 5.2 compat
--- cmd: ./configure --with-luajit-xcflags='-DLUAJIT_ENABLE_LUA52COMPAT' --dry-run
--- out
platform: linux (linux)
@ -4996,7 +4980,7 @@ clean:
=== TEST 60: --without-luajit-lua52
=== TEST 59: --without-luajit-lua52
--- cmd: ./configure --without-luajit-lua52 --dry-run
--- out
platform: linux (linux)
@ -5084,7 +5068,7 @@ clean:
=== TEST 61: --with-luajit-xcflags disable gc64
=== TEST 60: --with-luajit-xcflags disable gc64
--- cmd: ./configure --with-luajit-xcflags='-DLUAJIT_DISABLE_GC64' --dry-run
--- out
platform: linux (linux)
@ -5172,7 +5156,7 @@ clean:
=== TEST 62: --without-luajit-gc64
=== TEST 61: --without-luajit-gc64
--- cmd: ./configure --without-luajit-gc64 --dry-run
--- out
platform: linux (linux)
@ -5260,7 +5244,7 @@ clean:
=== TEST 63: --with-luajit-xcflags gc64 & --without-luajit-gc64
=== TEST 62: --with-luajit-xcflags gc64 & --without-luajit-gc64
--- cmd: ./configure --with-luajit-xcflags='-DLUAJIT_DISABLE_GC64' --without-luajit-gc64 --dry-run
--- out
platform: linux (linux)
@ -5348,7 +5332,7 @@ clean:
=== TEST 64: --sbin-path (absolute)
=== TEST 63: --sbin-path (absolute)
--- cmd: ./configure --sbin-path=/opt/blah/nginx --dry-run
--- out
platform: linux (linux)
@ -5436,7 +5420,7 @@ clean:
=== TEST 65: --sbin-path (relative)
=== TEST 64: --sbin-path (relative)
--- cmd: ./configure --sbin-path=../bin/nginx --dry-run
--- out
platform: linux (linux)
@ -5524,7 +5508,7 @@ clean:
=== TEST 66: --without-http_lua_upstream_module (on Linux)
=== TEST 65: --without-http_lua_upstream_module (on Linux)
--- cmd: ./configure --dry-run --without-http_lua_upstream_module
--- out
platform: linux (linux)
@ -5611,7 +5595,7 @@ clean:
=== TEST 67: --without-http_lua_module & --without-stream_lua_module
=== TEST 66: --without-http_lua_module & --without-stream_lua_module
--- cmd: ./configure --without-http_lua_module --without-stream_lua_module --dry-run
--- out
platform: linux (linux)
@ -5665,7 +5649,7 @@ clean:
=== TEST 68: relative path as the --add-dynamic-module option's value
=== TEST 67: relative path as the --add-dynamic-module option's value
--- cmd: ./configure --add-dynamic-module=/path/to/some/module --add-dynamic-module=../some/module/ --dry-run
--- out
platform: linux (linux)
@ -5753,7 +5737,7 @@ clean:
=== TEST 69: --without-stream_ssl_module and --without-http_ssl_module are respected
=== TEST 68: --without-stream_ssl_module and --without-http_ssl_module are respected
--- cmd: ./configure --without-http_ssl_module --without-stream_ssl_module --dry-run
--- out
platform: linux (linux)
@ -5796,7 +5780,7 @@ Type the following commands to build and install:
=== TEST 70: --without-stream_ssl_module and --with-stream_ssl_module specified at the same time causes errors
=== TEST 69: --without-stream_ssl_module and --with-stream_ssl_module specified at the same time causes errors
--- cmd: ./configure --with-stream_ssl_module --without-stream_ssl_module --dry-run
--- out
platform: linux (linux)
@ -5807,7 +5791,7 @@ platform: linux (linux)
=== TEST 71: --with-luajit-ldflags
=== TEST 70: --with-luajit-ldflags
--- cmd: ./configure --with-luajit --with-luajit-ldflags='-Wl,-rpath,/tmp/blah/foo' --dry-run
--- out
platform: linux (linux)
@ -5892,4 +5876,3 @@ install: all
clean:
rm -rf build *.exe *.dll openresty-*

12
util/configure vendored

@ -266,7 +266,7 @@ for my $opt (@ARGV) {
$resty_opts{"$1"} = 1;
} elsif ($opt eq '--with-luajit') {
$resty_opts{luajit} = 1;
# NOP for backwards-compatibility (the default)
} elsif ($opt =~ /^--with-luajit=(.*)/) {
$resty_opts{luajit_path} = $1;
@ -579,10 +579,6 @@ _END_
#die "luajit: ", $opts->{luajit};
if ($opts->{luajit} && $opts->{luajit_path}) {
die "--with-luajit and --with-luajit=DIR are mutually exclusive.\n";
}
if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
die "--with-http_ssl_module conflicts with --without-http_ssl_module.",
"\n";
@ -1311,8 +1307,7 @@ sub usage ($) {
--with-no-pool-patch enable the no-pool patch for debugging memory issues
-jN pass -jN option to make while building the bundled
Lua 5.1 interpreter or LuaJIT 2.1
-jN pass -jN option to make while building LuaJIT 2.1
_EOC_
@ -1392,12 +1387,11 @@ _EOC_
--without-lua_resty_shell disable the lua-resty-shell library
--without-lua_resty_core disable the lua-resty-core library
--with-luajit enable and build the bundled LuaJIT 2.1 (the default)
--with-luajit=DIR use the external LuaJIT 2.1 installation specified by DIR
--with-luajit-xcflags=FLAGS Specify extra C compiler flags for LuaJIT 2.1
--with-luajit-ldflags=FLAGS Specify extra C linker flags for LuaJIT 2.1
--without-luajit-lua52 Turns off the LuaJIT extensions from Lua 5.2 that may break
backward compatibility.
backward compatibility
--without-luajit-gc64 Turns off the LuaJIT GC64 mode (which is enabled by default
on x86_64)

Loading…
Cancel
Save