diff options
author | Bram Moolenaar <bram@vim.org> | 2013-11-21 12:17:51 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2013-11-21 12:17:51 +0100 |
commit | f811dde0fee0b2921a73ef14969c2cc9c048fdf7 (patch) | |
tree | 08d37fe93498a610598236137f82794f627375d8 | |
parent | 776a3382033a8f05527c853771fecf0d7cbb14c9 (diff) | |
download | vim-f811dde0fee0b2921a73ef14969c2cc9c048fdf7.tar.gz |
Problem: Regexp for LuaJIT version doesn't work on BSD.
Solution: Use "*" instead of "\+" and "\?". (Ozaki)
-rwxr-xr-x | src/auto/configure | 2 | ||||
-rw-r--r-- | src/configure.in | 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 472afcb4..32731fe1 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4743,7 +4743,7 @@ $as_echo_n "checking LuaJIT version... " >&6; } if test "${vi_cv_version_luajit+set}" = set; then : $as_echo_n "(cached) " >&6 else - vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]\+\)\? .*/\1/'` + vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 $as_echo "$vi_cv_version_luajit" >&6; } diff --git a/src/configure.in b/src/configure.in index 9af3f247..2718d315 100644 --- a/src/configure.in +++ b/src/configure.in @@ -496,7 +496,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "X$vi_cv_path_luajit" != "X"; then dnl -- find LuaJIT version AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit, - [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]\+\)\? .*/\1/'` ]) + [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]*\)* .*/\1/'` ]) AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit, [ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ]) vi_cv_path_lua="$vi_cv_path_luajit" diff --git a/src/version.c b/src/version.c index 66496f8e..f4a60690 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 95, +/**/ 94, /**/ 93, |