Mercurial > vim
changeset 4103:dc30c01f9956 v7.3.805
updated for version 7.3.805
Problem: Lua version 5.2 is not detected properly on Arch Linux.
Solution: Adjust autoconf. (lilydjwg)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 06 Feb 2013 19:49:43 +0100 |
| parents | 5ebccadf0fd7 |
| children | 68fffaa35464 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 18 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -4737,13 +4737,15 @@ fi if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll" else - for i in 0 1 2 3 4 5 6 7 8 9; do - if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then - LUA_SONAME=".$i" - break - fi + for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do + for i in 0 1 2 3 4 5 6 7 8 9; do + if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then + LUA_SONAME=".$i" + break + fi + done + vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME" done - vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME" fi $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
--- a/src/configure.in +++ b/src/configure.in @@ -496,13 +496,15 @@ if test "$enable_luainterp" = "yes" -o " else dnl Determine the SONAME for the current version, but fallback to dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found. - for i in 0 1 2 3 4 5 6 7 8 9; do - if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then - LUA_SONAME=".$i" - break - fi + for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do + for i in 0 1 2 3 4 5 6 7 8 9; do + if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then + LUA_SONAME=".$i" + break + fi + done + vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME" done - vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME" fi AC_DEFINE(DYNAMIC_LUA) LUA_LIBS=""