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
index 3ef90c87ffe7b362118e434451f12eebbd4964cc..5244a2eb46c132793c090d57ca142e4713701308 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4737,13 +4737,15 @@ $as_echo "no" >&6; }
       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
index 431bc2cbdf6f5a91cc80ab8864ea63d6e6ff9d94..d0fa6ffc06e59fdb2379953c385e58c60d3ed36e 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -496,13 +496,15 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
       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
index 261a032cb042816e7ff4e2af15fa388bc0b0039b..6981f9180c5485976d5316da2a1e141ea178a8c7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    805,
 /**/
     804,
 /**/