patch 8.2.2151: $dir not expanded when configure checks for moonjit

Problem:    $dir not expanded when configure checks for moonjit.
Solution:   Use double quotes instead of single quotes. (closes #7478)

diff --git a/src/auto/configure b/src/auto/configure
index ef1acd848db5a0aae1866dc89aea59dd6adf3a5e..0de0ea5b70cfbdeefeb3c0f9d1b49c3812af0cee 100755 (executable)
--- 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 062c75a20ac63549fb670f9996ec5139c4b0943c..22c280d415b236921f5b7dc8378e00025bee1531 100644 (file)
--- 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 86ccdd618072018e59c4020403067631515edc85..43daa6dd827ccf001b8e003c50478472c209dcbb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2151,
 /**/
     2150,
 /**/