patch 9.0.1433: on some systems the Lua library is not found

Problem:    On some systems the Lua library is not found.
Solution:   Check if a subdirectory for Lua exists.  (closes #4475)

diff --git a/src/auto/configure b/src/auto/configure
index eddb7216a884a97dd16b3f4790315fae791dc5a9..ba5a0744cbb2c4ddfb8dfa878861c5a8de3203e7 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5575,10 +5575,15 @@ $as_echo "no" >&6; }
        LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
       fi
     else
+            if test -d "${vi_cv_path_lua_pfx}/lib/lua$vi_cv_version_lua"; then
+       LUALIBDIR="lib/lua$vi_cv_version_lua"
+      else
+       LUALIBDIR=lib
+      fi
       if test "X$LUA_INC" != "X"; then
-               LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+               LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua$vi_cv_version_lua"
       else
-       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+       LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua"
       fi
     fi
     if test "$enable_luainterp" = "dynamic"; then

diff --git a/src/configure.ac b/src/configure.ac
index 13f5700d0fe21d6549819688bcb195d06061035b..94e186382dd3acca8f32c5c3685f464c265c82e9 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -716,11 +716,17 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
        LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
       fi
     else
+      dnl Test alternate lib location including version
+      if test -d "${vi_cv_path_lua_pfx}/lib/lua$vi_cv_version_lua"; then
+       LUALIBDIR="lib/lua$vi_cv_version_lua"
+      else
+       LUALIBDIR=lib
+      fi
       if test "X$LUA_INC" != "X"; then
-       dnl Test alternate location using version
-       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+       dnl Test alternate name including version
+       LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua$vi_cv_version_lua"
       else
-       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+       LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua"
       fi
     fi
     if test "$enable_luainterp" = "dynamic"; then

diff --git a/src/version.c b/src/version.c
index 1be8fbe774ccd734b60d9c5cf7bcf364d2651e0a..76f5f09e7a993904908d37d8124d432c314acc24 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1433,
 /**/
     1432,
 /**/