To: vim_dev@googlegroups.com
Subject: Patch 9.0.1433
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1433
Problem:    On some systems the Lua library is not found.
Solution:   Check if a subdirectory for Lua exists.  (closes #4475)
Files:      src/configure.ac, src/auto/configure


*** ../vim-9.0.1432/src/configure.ac	2023-01-18 16:09:48.109103156 +0000
--- src/configure.ac	2023-03-31 21:24:11.759620309 +0100
***************
*** 716,726 ****
  	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"
        else
! 	LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
        fi
      fi
      if test "$enable_luainterp" = "dynamic"; then
--- 716,732 ----
  	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 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
*** ../vim-9.0.1432/src/auto/configure	2023-01-18 16:09:48.109103156 +0000
--- src/auto/configure	2023-03-31 21:24:15.103621409 +0100
***************
*** 5575,5584 ****
  	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"
        else
! 	LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
        fi
      fi
      if test "$enable_luainterp" = "dynamic"; then
--- 5575,5589 ----
  	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}/${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
*** ../vim-9.0.1432/src/version.c	2023-03-31 19:32:13.162365622 +0100
--- src/version.c	2023-03-31 21:27:18.683657005 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1433,
  /**/

-- 
ARTHUR:  I am your king!
WOMAN:   Well, I didn't vote for you.
ARTHUR:  You don't vote for kings.
WOMAN:   Well, 'ow did you become king then?
                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///