# HG changeset patch # User Bram Moolenaar # Date 1360176583 -3600 # Node ID dc30c01f995623e65ee6651a46b12ff062df8860 # Parent 5ebccadf0fd7b57ed06f97c7f1b78d5f7324a471 updated for version 7.3.805 Problem: Lua version 5.2 is not detected properly on Arch Linux. Solution: Adjust autoconf. (lilydjwg) diff --git a/src/auto/configure b/src/auto/configure --- 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 diff --git a/src/configure.in b/src/configure.in --- 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="" diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -726,6 +726,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 805, +/**/ 804, /**/ 803,