From b176da9b89041c751f6b2b74e46571e2e86efe85 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 15 Apr 2017 02:10:49 +0200 Subject: configure: Skip some interpreter checks if --runwith is set --- configure | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/configure b/configure index c2c96bcd..08f631ee 100755 --- a/configure +++ b/configure @@ -425,7 +425,7 @@ else } fi -if [ "$lua_interp_found" != "yes" ] +if [ "$lua_interp_found" != "yes" -a "$RUNWITH_SET" != "yes" ] then [ "$LUA_VERSION_SET" ] && { interp="Lua $LUA_VERSION" ;} || { interp="Lua" ;} [ "$LUA_DIR_SET" -o "$LUA_BINDIR_SET" ] && { where="$LUA_BINDIR" ;} || { where="\$PATH" ;} @@ -433,7 +433,7 @@ then die "You may want to use the flags --with-lua, --with-lua-bin and/or --lua-suffix. See --help." fi -if [ "$LUA_VERSION_SET" = "yes" ] +if [ "$LUA_VERSION_SET" = "yes" -a "$RUNWITH_SET" != "yes" ] then echo_n "Checking if $LUA_BINDIR/lua$LUA_SUFFIX is Lua version $LUA_VERSION... " if detect_lua_version "$LUA_BINDIR/lua$LUA_SUFFIX" @@ -481,15 +481,18 @@ else fi fi -echo_n "Checking if Lua header version matches that of the interpreter... " -header_version=$(sed -n 's/.*LUA_VERSION_NUM.*5.\(.\).*/5.\1/p' "$lua_h") -if [ "$header_version" = "$LUA_VERSION" ] +if [ "$lua_interp_found" = "yes" ] then - echo "yes" -else - echo "no" - echo "lua.h version mismatch (interpreter: $LUA_VERSION; lua.h: $header_version)." - die "You may want to use the flag --with-lua or --with-lua-include. See --help." + echo_n "Checking if Lua header version matches that of the interpreter... " + header_version=$(sed -n 's/.*LUA_VERSION_NUM.*5.\(.\).*/5.\1/p' "$lua_h") + if [ "$header_version" = "$LUA_VERSION" ] + then + echo "yes" + else + echo "no" + echo "lua.h version mismatch (interpreter: $LUA_VERSION; lua.h: $header_version)." + die "You may want to use the flag --with-lua or --with-lua-include. See --help." + fi fi echo_n "Configuring for system... " -- cgit v1.2.3