Mercurial > vim
changeset 32204:d5c4c44b54c7 v9.0.1433
patch 9.0.1433: on some systems the Lua library is not found
Commit: https://github.com/vim/vim/commit/869113f3765d51fc822a61b2ba53d339797c1231
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 31 21:29:00 2023 +0100
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 https://github.com/vim/vim/issues/4475)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 31 Mar 2023 22:30:04 +0200 |
parents | ea636846c2c0 |
children | 4629e7ede81c |
files | src/auto/configure src/configure.ac src/version.c |
diffstat | 3 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5575,10 +5575,15 @@ fi 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
--- a/src/configure.ac +++ b/src/configure.ac @@ -716,11 +716,17 @@ if test "$enable_luainterp" = "yes" -o " 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