rrdtool/rrdtool-1.5.4-lua-5.2.patch
Jaroslav Škarvada d5e7d7f41b New version
Resolves: rhbz#1251737
- Defuzzified ruby-2-fix and lua-5.2 patches
2015-08-10 15:04:15 +02:00

32 lines
1.1 KiB
Diff

diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c
index bfbc174..b54f787 100644
--- a/bindings/lua/rrdlua.c
+++ b/bindings/lua/rrdlua.c
@@ -350,7 +350,7 @@ set_info (lua_State * L)
/**********************************************************/
-static const struct luaL_reg rrd[] = {
+static const struct luaL_Reg rrd[] = {
{"create", lua_rrd_create},
{"dump", lua_rrd_dump},
{"fetch", lua_rrd_fetch},
diff --git a/configure.ac b/configure.ac
index 1a84037..4575f00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -813,7 +813,12 @@ LUA_EOF
LIBS=
lua_havelib=no
LUA_HAVE_COMPAT51=DONT_HAVE_COMPAT51
- AC_SEARCH_LIBS(lua_call, lua$lua_vdot lua$lua_vndot lua,
+ if test "$lua_vndot" -ge "52"; then
+ CALL_FUNC=lua_callk
+ else
+ CALL_FUNC=lua_call
+ fi
+ AC_SEARCH_LIBS($CALL_FUNC, lua$lua_vdot lua$lua_vndot lua,
[AC_SEARCH_LIBS(luaL_register, lua$lua_vdot lua$lua_vndot lua,
[lua_havelib=LUA$lua_vndot],
[AC_SEARCH_LIBS(luaL_module, lualib$lua_vndot lualib$lua_vdot lualib,