updated for version 7.4.095

Problem:    Regexp for LuaJIT version doesn't work on BSD.
Solution:   Use "*" instead of "\+" and "\?". (Ozaki)

diff --git a/src/auto/configure b/src/auto/configure
index 472afcb425f16d226ded7d40f1d317a7472b03bf..32731fe1d7f40da26b39e70d83a1ee3aa30cf77b 100755 (executable)
--- 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 9af3f2475d32a7c0c8c4af1fd8d54a086044b6d2..2718d315214213da6ecd53cfc1043c0a2499dc28 100644 (file)
--- 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 66496f8eb5e47fa371153f424ad9a9ffb7bf70f8..f4a60690ae60a4445e1b77b636eb15a207988716 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    95,
 /**/
     94,
 /**/