patch 8.2.0609: configure does not detect moonjit correctly

Problem:    Configure does not detect moonjit correctly.
Solution:   Double the brackets. (Ozaki Kiichi)

diff --git a/src/auto/configure b/src/auto/configure
index b6d4bf975def31dc8ee67c41f786ad51a119a8ca..bd26a7c5909b3dc4761bd14feddd7831f77c74de 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5485,7 +5485,7 @@ $as_echo "no" >&6; }
          # 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
+         for dir in "$inc_path"/moonjit-[0-9]* ; do
            if test -d "$dir" ; then
              lua_suf=`basename '$dir'`
              lua_suf="/$lua_suf"

diff --git a/src/configure.ac b/src/configure.ac
index ebb79ced648f6045ab7e44bda9bca612cb7cbd39..2037de74fabebd769a481a2f264401071f12e490 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -630,7 +630,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
          # 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
+         for dir in "$inc_path"/moonjit-[[0-9]]* ; do
            if test -d "$dir" ; then
              lua_suf=`basename '$dir'`
              lua_suf="/$lua_suf"

diff --git a/src/version.c b/src/version.c
index 2b1a12609240c957921933210cb5f9128b921252..61f71a0c1d30fa7fe0ebaf261bf7c2c3b490d742 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 */
+/**/
+    609,
 /**/
     608,
 /**/