mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Skip some interpreter checks if --runwith is set

Browse source
This commit is contained in:
Kim Alvefur 2017-04-15 02:10:49 +02:00
parent 368d066955
commit 098b1c9663
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
configure vendored
View file

@ -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... "