From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 20 Apr 2020 14:21:53 +0000 (+0200)
Subject: patch 8.2.0609: configure does not detect moonjit correctly
X-Git-Tag: v8.2.0609
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad4dc83389931a0354c3691b42f99a5bb98c766f;p=vim

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 b6d4bf975..bd26a7c59 100755
--- 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 ebb79ced6..2037de74f 100644
--- 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 2b1a12609..61f71a0c1 100644
--- 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,
 /**/