aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

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

Browse Source 
Problem:    On some systems the Lua library is not found.
Solution:   Check if a subdirectory for Lua exists.  (closes #4475)
This commit is contained in:
Bram Moolenaar
2023-03-31 21:29:00 +01:00
parent 6ac2e4392a
commit 869113f376
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/auto/configure vendored
View File

@@ -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 "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

14
src/configure.ac
View File

@@ -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
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

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1433,
/**/
1432,
/**/