commit 09b4e5043e79b4deddc533d0d7803be4c8b30203
author Christian Ruppert <idl0r@qasl.de> Tue Jun 28 10:03:00 2022 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Thu Jul 21 17:13:55 2022 +0200
tree 3dfd5d671765130cdb4f1e1b3e3ded80fdd6c877
parent 64ff81b99453d61ec38a3f4037d4b86e53afc356

BUILD: Makefile: Add Lua 5.4 autodetect

This patch is based on:
https://www.mail-archive.com/haproxy@formilux.org/msg39689.html
Thanks to Callum Farmer!

Signed-off-by: Christian Ruppert <idl0r@qasl.de>
(cherry picked from commit 3214b44702d4a4fb7564f8561396fb96d40e3881)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 28389ee271b78f9fd1dfac659ab14c56d4cce8b7)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 18873a85e75b3dc3c2728fb84c958dc167604892)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

Makefile

diff --git a/Makefile b/Makefile
index ccf6b01..e9c2c54 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@
 #   LUA_LIB        : force the lib path to lua
 #   LUA_INC        : force the include path to lua
 #   LUA_LIB_NAME   : force the lib name (or automatically evaluated, by order of
-#                                        priority : lua5.3, lua53, lua).
+#                                        priority : lua5.4, lua54, lua5.3, lua53, lua).
 #   OT_DEBUG       : compile the OpenTracing filter in debug mode
 #   OT_INC         : force the include path to libopentracing-c-wrapper
 #   OT_LIB         : force the lib path to libopentracing-c-wrapper
@@ -614,11 +614,11 @@
 LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB))
 ifeq ($(LUA_LIB_NAME),)
 # Try to automatically detect the Lua library
-LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))
+LUA_LIB_NAME := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))
 ifeq ($(LUA_LIB_NAME),)
-$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.3, lua53, lua, ...))
+$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.4, lua54, lua, ...))
 endif
-LUA_INC := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
+LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
 ifneq ($(LUA_INC),)
 OPTIONS_CFLAGS  += -I$(LUA_INC)
 endif