From: Thierry FOURNIER Date: Mon, 9 Mar 2015 23:35:36 +0000 (+0100) Subject: BUG/BUILD: lua: The strict Lua 5.3 version check is not done. X-Git-Tag: v1.6-dev1~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=463119ccc115e5b671ab02e425f1542578263b3d;p=thirdparty%2Fhaproxy.git BUG/BUILD: lua: The strict Lua 5.3 version check is not done. This patch fix the Lua library check. Only the version 5.3 or later is allowed. This bug is added by the patch "MEDIUM: lua: use the Lua-5.3 version of the library" with commit id f90838b71a3c7f84e1d8b4ff85760a35d60c6910 --- diff --git a/Makefile b/Makefile index 1a317924f3..a12e4c9fcd 100644 --- a/Makefile +++ b/Makefile @@ -569,9 +569,9 @@ OPTIONS_CFLAGS += -DUSE_LUA $(if $(LUA_INC),-I$(LUA_INC)) LUA_LD_FLAGS := $(if $(LUA_LIB),-L$(LUA_LIB)) ifeq ($(LUA_LIB_NAME),) # Try to automatically detect the Lua library -LUA_LIB_NAME := $(firstword $(foreach lib,lua5.2 lua52 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS)))) +LUA_LIB_NAME := $(firstword $(foreach lib,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= (where can be lua5.2, lua52, lua, ...)) +$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME= (where can be lua5.3, lua53, lua, ...)) endif endif diff --git a/src/hlua.c b/src/hlua.c index 564f5bace0..fb39dc11f0 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -4,8 +4,8 @@ #include #include -#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 -#error "Requires Lua 5.2 or later." +#if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 503 +#error "Requires Lua 5.3 or later." #endif #include