diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-20 16:21:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-20 16:21:53 +0200 |
| commit | ad4dc83389931a0354c3691b42f99a5bb98c766f (patch) | |
| tree | 5cb574aea3c3c8d2abab85dc3b69afb36577a11d | |
| parent | 4da6df40f5a637de42cad8e6939dfe8463b211db (diff) | |
patch 8.2.0609: configure does not detect moonjit correctlyv8.2.0609
Problem: Configure does not detect moonjit correctly.
Solution: Double the brackets. (Ozaki Kiichi)
| -rwxr-xr-x | src/auto/configure | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index b6d4bf975d..bd26a7c590 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 ebb79ced64..2037de74fa 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 2b1a126092..61f71a0c1d 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 609, +/**/ 608, /**/ 607, |