|
 |
c91c209 |
To: vim_dev@googlegroups.com
|
|
|
c91c209 |
Subject: Patch 7.3.805
|
|
|
c91c209 |
Fcc: outbox
|
|
|
c91c209 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
c91c209 |
Mime-Version: 1.0
|
|
|
c91c209 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c91c209 |
Content-Transfer-Encoding: 8bit
|
|
|
c91c209 |
------------
|
|
|
c91c209 |
|
|
|
c91c209 |
Patch 7.3.805
|
|
|
c91c209 |
Problem: Lua version 5.2 is not detected properly on Arch Linux.
|
|
|
c91c209 |
Solution: Adjust autoconf. (lilydjwg)
|
|
|
c91c209 |
Files: src/configure.in, src/auto/configure
|
|
|
c91c209 |
|
|
|
c91c209 |
|
|
|
c91c209 |
*** ../vim-7.3.804/src/configure.in 2013-01-30 14:55:34.000000000 +0100
|
|
|
c91c209 |
--- src/configure.in 2013-02-06 19:22:17.000000000 +0100
|
|
|
c91c209 |
***************
|
|
|
c91c209 |
*** 496,508 ****
|
|
|
c91c209 |
else
|
|
|
c91c209 |
dnl Determine the SONAME for the current version, but fallback to
|
|
|
c91c209 |
dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
|
|
|
c91c209 |
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
|
|
c91c209 |
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
|
|
|
c91c209 |
! LUA_SONAME=".$i"
|
|
|
c91c209 |
! break
|
|
|
c91c209 |
! fi
|
|
|
c91c209 |
done
|
|
|
c91c209 |
- vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
|
|
|
c91c209 |
fi
|
|
|
c91c209 |
AC_DEFINE(DYNAMIC_LUA)
|
|
|
c91c209 |
LUA_LIBS=""
|
|
|
c91c209 |
--- 496,510 ----
|
|
|
c91c209 |
else
|
|
|
c91c209 |
dnl Determine the SONAME for the current version, but fallback to
|
|
|
c91c209 |
dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
|
|
|
c91c209 |
! for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
|
|
|
c91c209 |
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
|
|
c91c209 |
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
|
|
|
c91c209 |
! LUA_SONAME=".$i"
|
|
|
c91c209 |
! break
|
|
|
c91c209 |
! fi
|
|
|
c91c209 |
! done
|
|
|
c91c209 |
! vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
|
|
|
c91c209 |
done
|
|
|
c91c209 |
fi
|
|
|
c91c209 |
AC_DEFINE(DYNAMIC_LUA)
|
|
|
c91c209 |
LUA_LIBS=""
|
|
|
c91c209 |
*** ../vim-7.3.804/src/auto/configure 2013-01-30 14:55:34.000000000 +0100
|
|
|
c91c209 |
--- src/auto/configure 2013-02-06 19:24:11.000000000 +0100
|
|
|
c91c209 |
***************
|
|
|
c91c209 |
*** 4737,4749 ****
|
|
|
c91c209 |
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
|
|
|
c91c209 |
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
|
|
|
c91c209 |
else
|
|
|
c91c209 |
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
|
|
c91c209 |
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
|
|
|
c91c209 |
! LUA_SONAME=".$i"
|
|
|
c91c209 |
! break
|
|
|
c91c209 |
! fi
|
|
|
c91c209 |
done
|
|
|
c91c209 |
- vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
|
|
|
c91c209 |
fi
|
|
|
c91c209 |
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
|
|
c91c209 |
|
|
|
c91c209 |
--- 4737,4751 ----
|
|
|
c91c209 |
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
|
|
|
c91c209 |
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
|
|
|
c91c209 |
else
|
|
|
c91c209 |
! for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
|
|
|
c91c209 |
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
|
|
c91c209 |
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
|
|
|
c91c209 |
! LUA_SONAME=".$i"
|
|
|
c91c209 |
! break
|
|
|
c91c209 |
! fi
|
|
|
c91c209 |
! done
|
|
|
c91c209 |
! vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
|
|
|
c91c209 |
done
|
|
|
c91c209 |
fi
|
|
|
c91c209 |
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
|
|
c91c209 |
|
|
|
c91c209 |
*** ../vim-7.3.804/src/version.c 2013-02-06 18:44:57.000000000 +0100
|
|
|
c91c209 |
--- src/version.c 2013-02-06 19:26:37.000000000 +0100
|
|
|
c91c209 |
***************
|
|
|
c91c209 |
*** 727,728 ****
|
|
|
c91c209 |
--- 727,730 ----
|
|
|
c91c209 |
{ /* Add new patch number below this line */
|
|
|
c91c209 |
+ /**/
|
|
|
c91c209 |
+ 805,
|
|
|
c91c209 |
/**/
|
|
|
c91c209 |
|
|
|
c91c209 |
--
|
|
|
c91c209 |
Permission is granted to read this message out aloud on Kings Cross Road,
|
|
|
c91c209 |
London, under the condition that the orator is properly dressed.
|
|
|
c91c209 |
|
|
|
c91c209 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
c91c209 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
c91c209 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
c91c209 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|