summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-17 20:50:25 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-17 20:50:25 +0100
commita79a8944dade9115ccaa5a06a076dfb257e56c62 (patch)
treec9fb0d221cb756bfd84f0427cb618ec5e7034fd2
parent8ea05de6aa1d133cba3381bcc36adf1736b08e00 (diff)
downloadvim-git-a79a8944dade9115ccaa5a06a076dfb257e56c62.tar.gz
patch 8.2.2151: $dir not expanded when configure checks for moonjitv8.2.2151
Problem: $dir not expanded when configure checks for moonjit. Solution: Use double quotes instead of single quotes. (closes #7478)
-rwxr-xr-xsrc/auto/configure2
-rw-r--r--src/configure.ac2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index ef1acd848..0de0ea5b7 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5479,7 +5479,7 @@ $as_echo "no" >&6; }
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=`basename "$dir"`
lua_suf="/$lua_suf"
break
fi
diff --git a/src/configure.ac b/src/configure.ac
index 062c75a20..22c280d41 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -632,7 +632,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
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=`basename "$dir"`
lua_suf="/$lua_suf"
break
fi
diff --git a/src/version.c b/src/version.c
index 86ccdd618..43daa6dd8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2151,
+/**/
2150,
/**/
2149,