Mercurial > vim
changeset 20095:06cc64c7b0cb v8.2.0603
patch 8.2.0603: configure does not detect moonjit
Commit: https://github.com/vim/vim/commit/f49e5640821d8ef752fb50d99edcf40bb62a4d4d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 19 17:46:53 2020 +0200
patch 8.2.0603: configure does not detect moonjit
Problem: Configure does not detect moonjit.
Solution: Add check for moonjit. (Shlomi Fish, closes https://github.com/vim/vim/issues/5947)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 19 Apr 2020 18:00:03 +0200 |
| parents | 3990c9fed293 |
| children | f68ea7ef5ab2 |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 45 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5480,7 +5480,29 @@ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - vi_cv_path_lua_pfx= + + # 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
--- a/src/configure.ac +++ b/src/configure.ac @@ -625,7 +625,26 @@ if test "$enable_luainterp" = "yes" -o " LUA_INC=/lua$vi_cv_version_lua else AC_MSG_RESULT(no) - vi_cv_path_lua_pfx= + + # 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