Skip to content

Commit 111e89e

Browse files
committed
updated for version 7.4.095
Problem: Regexp for LuaJIT version doesn't work on BSD. Solution: Use "*" instead of "\+" and "\?". (Ozaki)
1 parent 2247036 commit 111e89e

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4743,7 +4743,7 @@ $as_echo_n "checking LuaJIT version... " >&6; }
47434743
if test "${vi_cv_version_luajit+set}" = set; then :
47444744
$as_echo_n "(cached) " >&6
47454745
else
4746-
vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]\+\)\? .*/\1/'`
4746+
vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'`
47474747
fi
47484748
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5
47494749
$as_echo "$vi_cv_version_luajit" >&6; }

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
496496
if test "X$vi_cv_path_luajit" != "X"; then
497497
dnl -- find LuaJIT version
498498
AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit,
499-
[ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]\+\)\? .*/\1/'` ])
499+
[ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]*\)* .*/\1/'` ])
500500
AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit,
501501
[ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ])
502502
vi_cv_path_lua="$vi_cv_path_luajit"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
95,
741743
/**/
742744
94,
743745
/**/

0 commit comments

Comments
 (0)