From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 17 Nov 2013 19:17:12 +0000 (+0100)
Subject: updated for version 7.4.093
X-Git-Tag: v7.4.093
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9421bdc2cd7cdcd801bcde4d41ea0a2c60b66199;p=vim

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 63da09823..5a205966e 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 | 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 8f0dce4c3..83d0ea880 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 | 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 24a3e8b21..9552bba4e 100644
--- 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,
 /**/