From 885b470d51a0085523da2b2099ad63c1919c74f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sat, 4 Sep 2021 19:46:14 +0200
Subject: [PATCH] lua: add detection of Lua 5.4

---
 ChangeLog.adoc      | 3 ++-
 cmake/FindLua.cmake | 2 +-
 configure.ac        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 40734a4f0..e3c00045d 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -64,8 +64,9 @@ Tests::
 
 Build::
 
-  * php: add support of PHP 8.0 and 8.1 (issue #1668)
   * core: fix build on macOS (issue #1662)
+  * lua: add detection of Lua 5.4
+  * php: add support of PHP 8.0 and 8.1 (issue #1668)
 
 [[v3.2.1]]
 == Version 3.2.1 (2021-09-04)
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
index 156361b35..a702cc793 100644
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@@ -35,5 +35,5 @@ endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(LUA lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
+  pkg_search_module(LUA lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua-5.0 lua5.0 lua50 lua)
 endif()
diff --git a/configure.ac b/configure.ac
index a6cd9f1f9..661f914b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,7 +573,7 @@ if test "x$enable_lua" = "xyes" ; then
     if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
         AC_MSG_CHECKING(for Lua headers and libraries with pkg-config)
         echo
-        for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
+        for l in "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
             pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
             if test "x$?" = "x0" ; then
                 LUA_VERSION=`$PKGCONFIG --modversion lua$l`
@@ -592,7 +592,7 @@ if test "x$enable_lua" = "xyes" ; then
 
     if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
         LUACONFIG=""
-        AC_CHECK_PROGS(LUACONFIG, lua-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config)
+        AC_CHECK_PROGS(LUACONFIG, lua-config54 lua-config5.4 lua-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config)
         if test "x$LUACONFIG" != "x" ; then
             AC_MSG_CHECKING(for Lua headers and libraries with lua-config)
             echo
@@ -610,7 +610,7 @@ if test "x$enable_lua" = "xyes" ; then
         if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then
             LUA_CFLAGS="$CFLAGS"
         fi
-        for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
+        for l in "54" "5.4" "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do
             AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no")
             if test "x$ac_found_lua_lib" = "xyes" ; then
                 LUA_VERSION=">=5.1.0"