patch 8.2.0603: configure does not detect moonjit

Problem:    Configure does not detect moonjit.
Solution:   Add check for moonjit. (Shlomi Fish, closes #5947)

diff --git a/src/auto/configure b/src/auto/configure
index e72cf70cd44f7aa9e0c473f88d1f847719b7753c..b6d4bf975def31dc8ee67c41f786ad51a119a8ca 100755 (executable)
--- 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 972337b46188b9b60b454bd65aa8bb7f56759f8d..ebb79ced648f6045ab7e44bda9bca612cb7cbd39 100644 (file)
--- 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 66f5365b8c5471cf5e5b61b9068d2547979551a2..c2e492887b7f7353d68e8e093ee07b871d1be6bb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    603,
 /**/
     602,
 /**/