From a79a8944dade9115ccaa5a06a076dfb257e56c62 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 17 Dec 2020 20:50:25 +0100 Subject: [PATCH] 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) --- src/auto/configure | 2 +- src/configure.ac | 2 +- src/version.c | 2 ++ 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 @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2151, /**/ 2150, /**/ -- 2.50.1