updated for version 7.4.093

Problem:    Configure can't use LuaJIT on ubuntu 12.04.
Solution:   Adjust the configure regexp that locates the version number.
            (Charles Strahan)

diff --git a/src/auto/configure b/src/auto/configure
index 63da09823f5d598de4468c1a49d2d1679e6d42b1..5a205966e5b8beaed8a39b5e1f8d30eb1e13a7b4 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 | sed 's/LuaJIT \([0-9.]*\)\.[0-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 8f0dce4c3eedf4fb6e8b45fbc72930bdc867ebf4..83d0ea880e1be8ec93218b0014bbd58a60fb0bb0 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 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-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 24a3e8b2107b797e44a818622bdae30e27fd1a67..9552bba4e6b467c5b4c8ab949e076d52c54aac9d 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 */
+/**/
+    93,
 /**/
     92,
 /**/