|
 |
8b9a1c |
To: vim_dev@googlegroups.com
|
|
|
8b9a1c |
Subject: Patch 7.4.093
|
|
|
8b9a1c |
Fcc: outbox
|
|
|
8b9a1c |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
8b9a1c |
Mime-Version: 1.0
|
|
|
8b9a1c |
Content-Type: text/plain; charset=UTF-8
|
|
|
8b9a1c |
Content-Transfer-Encoding: 8bit
|
|
|
8b9a1c |
------------
|
|
|
8b9a1c |
|
|
|
8b9a1c |
Patch 7.4.093
|
|
|
8b9a1c |
Problem: Configure can't use LuaJIT on ubuntu 12.04.
|
|
|
8b9a1c |
Solution: Adjust the configure regexp that locates the version number.
|
|
|
8b9a1c |
(Charles Strahan)
|
|
|
8b9a1c |
Files: src/configure.in, src/auto/configure
|
|
|
8b9a1c |
|
|
|
8b9a1c |
|
|
|
8b9a1c |
*** ../vim-7.4.092/src/configure.in 2013-11-04 04:57:46.000000000 +0100
|
|
|
8b9a1c |
--- src/configure.in 2013-11-17 20:12:04.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 496,502 ****
|
|
|
8b9a1c |
if test "X$vi_cv_path_luajit" != "X"; then
|
|
|
8b9a1c |
dnl -- find LuaJIT version
|
|
|
8b9a1c |
AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit,
|
|
|
8b9a1c |
! [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]] .*/\1/'` ])
|
|
|
8b9a1c |
AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit,
|
|
|
8b9a1c |
[ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ])
|
|
|
8b9a1c |
vi_cv_path_lua="$vi_cv_path_luajit"
|
|
|
8b9a1c |
--- 496,502 ----
|
|
|
8b9a1c |
if test "X$vi_cv_path_luajit" != "X"; then
|
|
|
8b9a1c |
dnl -- find LuaJIT version
|
|
|
8b9a1c |
AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit,
|
|
|
8b9a1c |
! [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]\+\)\? .*/\1/'` ])
|
|
|
8b9a1c |
AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit,
|
|
|
8b9a1c |
[ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ])
|
|
|
8b9a1c |
vi_cv_path_lua="$vi_cv_path_luajit"
|
|
|
8b9a1c |
*** ../vim-7.4.092/src/auto/configure 2013-11-04 04:57:46.000000000 +0100
|
|
|
8b9a1c |
--- src/auto/configure 2013-11-17 20:13:30.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 4743,4749 ****
|
|
|
8b9a1c |
if test "${vi_cv_version_luajit+set}" = set; then :
|
|
|
8b9a1c |
$as_echo_n "(cached) " >&6
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
! vi_cv_version_luajit=`${vi_cv_path_luajit} -v | sed 's/LuaJIT \([0-9.]*\)\.[0-9] .*/\1/'`
|
|
|
8b9a1c |
fi
|
|
|
8b9a1c |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5
|
|
|
8b9a1c |
$as_echo "$vi_cv_version_luajit" >&6; }
|
|
|
8b9a1c |
--- 4743,4749 ----
|
|
|
8b9a1c |
if test "${vi_cv_version_luajit+set}" = set; then :
|
|
|
8b9a1c |
$as_echo_n "(cached) " >&6
|
|
|
8b9a1c |
else
|
|
|
8b9a1c |
! vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]\+\)\? .*/\1/'`
|
|
|
8b9a1c |
fi
|
|
|
8b9a1c |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5
|
|
|
8b9a1c |
$as_echo "$vi_cv_version_luajit" >&6; }
|
|
|
8b9a1c |
*** ../vim-7.4.092/src/version.c 2013-11-14 03:54:02.000000000 +0100
|
|
|
8b9a1c |
--- src/version.c 2013-11-17 20:13:43.000000000 +0100
|
|
|
8b9a1c |
***************
|
|
|
8b9a1c |
*** 740,741 ****
|
|
|
8b9a1c |
--- 740,743 ----
|
|
|
8b9a1c |
{ /* Add new patch number below this line */
|
|
|
8b9a1c |
+ /**/
|
|
|
8b9a1c |
+ 93,
|
|
|
8b9a1c |
/**/
|
|
|
8b9a1c |
|
|
|
8b9a1c |
--
|
|
|
8b9a1c |
"Beware of bugs in the above code; I have only proved
|
|
|
8b9a1c |
it correct, not tried it." -- Donald Knuth
|
|
|
8b9a1c |
|
|
|
8b9a1c |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
8b9a1c |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
8b9a1c |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
8b9a1c |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|