diff options
| -rwxr-xr-x | src/auto/configure | 9 | ||||
| -rw-r--r-- | src/configure.ac | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index eddb7216a8..ba5a0744cb 100755 --- 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 13f5700d0f..94e186382d 100644 --- 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 1be8fbe774..76f5f09e7a 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1433, +/**/ 1432, /**/ 1431, |