aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0603: configure does not detect moonjit

Browse Source 
Problem:    Configure does not detect moonjit.
Solution:   Add check for moonjit. (Shlomi Fish, closes #5947)
This commit is contained in:
Bram Moolenaar 2020-04-19 17:46:53 +02:00
parent 7e0868efcf
commit f49e564082
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/auto/configure vendored
View File

@ -5480,11 +5480,33 @@ $as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
# Detect moonjit:
# https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk
lua_suf=/moonjit-2.3
inc_path="$vi_cv_path_lua_pfx/include"
for dir in "$inc_path"/moonjit-0-9* ; do
if test -d "$dir" ; then
lua_suf=`basename '$dir'`
lua_suf="/$lua_suf"
break
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5
$as_echo_n "checking if lua.h can be found in $inc_path$lua_suf... " >&6; }
if test -f "$inc_path$lua_suf/lua.h"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LUA_INC=$lua_suf
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
vi_cv_path_lua_pfx=
fi
fi
fi
fi
fi
if test "X$vi_cv_path_lua_pfx" != "X"; then
if test "x$vi_cv_with_luajit" != "xno"; then

19
src/configure.ac
View File

@ -625,11 +625,30 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
LUA_INC=/lua$vi_cv_version_lua
else
AC_MSG_RESULT(no)
# Detect moonjit:
# https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk
lua_suf=/moonjit-2.3
inc_path="$vi_cv_path_lua_pfx/include"
for dir in "$inc_path"/moonjit-[0-9]* ; do
if test -d "$dir" ; then
lua_suf=`basename '$dir'`
lua_suf="/$lua_suf"
break
fi
done
AC_MSG_CHECKING(if lua.h can be found in $inc_path$lua_suf)
if test -f "$inc_path$lua_suf/lua.h"; then
AC_MSG_RESULT(yes)
LUA_INC=$lua_suf
else
AC_MSG_RESULT(no)
vi_cv_path_lua_pfx=
fi
fi
fi
fi
fi
if test "X$vi_cv_path_lua_pfx" != "X"; then
if test "x$vi_cv_with_luajit" != "xno"; then

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
603,
/**/
602,
/**/