diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-19 17:46:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-19 17:46:53 +0200 |
| commit | f49e5640821d8ef752fb50d99edcf40bb62a4d4d (patch) | |
| tree | 4aaa93000ae30bae32bd7823de49a319798843b4 | |
| parent | 7e0868efcf094f2cc59fa4e18af3a8dc7aedd64f (diff) | |
| download | vim-git-f49e5640821d8ef752fb50d99edcf40bb62a4d4d.tar.gz | |
patch 8.2.0603: configure does not detect moonjitv8.2.0603
Problem: Configure does not detect moonjit.
Solution: Add check for moonjit. (Shlomi Fish, closes #5947)
| -rwxr-xr-x | src/auto/configure | 24 | ||||
| -rw-r--r-- | src/configure.ac | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 45 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index e72cf70cd..b6d4bf975 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5480,7 +5480,29 @@ $as_echo "yes" >&6; } 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 diff --git a/src/configure.ac b/src/configure.ac index 972337b46..ebb79ced6 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -625,7 +625,26 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then 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 diff --git a/src/version.c b/src/version.c index 66f5365b8..c2e492887 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 603, +/**/ 602, /**/ 601, |