From 20ef01d75c3c4ec5ed32ef416d7db9af3a2fcd99 Mon Sep 17 00:00:00 2001 From: Victor Hora Date: Fri, 12 Oct 2018 17:31:09 -0400 Subject: [PATCH] Allow LuaJIT 2.1 to be used --- build/lua.m4 | 3 ++- src/engine/lua.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/lua.m4 b/build/lua.m4 index 75b23520..49a54b48 100644 --- a/build/lua.m4 +++ b/build/lua.m4 @@ -68,7 +68,8 @@ else case $LUA_PKG_VERSION in (5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; (5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; lua_5_2=1 ;; - (2.*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; + (2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; + (2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ; lua_5_1=1 ;; esac AC_MSG_NOTICE([LUA pkg-config version: ${LUA_PKG_VERSION}]) fi diff --git a/src/engine/lua.h b/src/engine/lua.h index b0972dfc..b1b77e2d 100644 --- a/src/engine/lua.h +++ b/src/engine/lua.h @@ -102,7 +102,7 @@ static const struct luaL_Reg mscLuaLib[] = { } // namespace modsecurity #ifdef WITH_LUA -#if defined LUA_VERSION_NUM && LUA_VERSION_NUM < 502 +#if defined LUA_VERSION_NUM && LUA_VERSION_NUM < 502 && !defined WITH_LUA_JIT_2_1 /* ** Adapted from Lua 5.2.0 */