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 eddb721..ba5a074 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5575,10 +5575,15 @@
LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
fi
else
- if test "X$LUA_INC" != "X"; then
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
+ if test -d "${vi_cv_path_lua_pfx}/lib/lua$vi_cv_version_lua"; then
+ LUALIBDIR="lib/lua$vi_cv_version_lua"
else
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ LUALIBDIR=lib
+ fi
+ if test "X$LUA_INC" != "X"; then
+ LUA_LIBS="-L${vi_cv_path_lua_pfx}/${LUALIBDIR} -llua$vi_cv_version_lua"
+ else
+ 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 13f5700..94e1863 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -716,11 +716,17 @@
LUA_LIBS="-L${vi_cv_path_lua_pfx}/${lib_multiarch} -lluajit-$vi_cv_version_lua"
fi
else
- 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 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
- LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
+ LUALIBDIR=lib
+ fi
+ if test "X$LUA_INC" != "X"; then
+ 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}/${LUALIBDIR} -llua"
fi
fi
if test "$enable_luainterp" = "dynamic"; then
diff --git a/src/version.c b/src/version.c
index 1be8fbe..76f5f09 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1433,
+/**/
1432,
/**/
1431,