fix compiling with luajit-2.1.0-beta3

It added a function from lua > 5.1, without bumping the language
version.  The changelog seems safe and Deckard still passes.

diff --git a/daemon/bindings.h b/daemon/bindings.h
index 2c2c50483e699c2bd67d2981a72f39a963abf764..5540778090b48e3cedb6f3fb396b3174eb42e5a4 100644 (file)
--- a/daemon/bindings.h
+++ b/daemon/bindings.h
@@ -34,6 +34,9 @@
        lua_objlen((L), (obj))
 #define register_lib(L, name, lib) \
        luaL_openlib((L), (name), (lib), 0)
+#endif
+
+#if !LUA_HAS_SETFUNCS
 /* Adapted from Lua 5.2.0 */
 static inline void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
   luaL_checkstack(L, nup+1, "too many upvalues");

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 70a149053509d2d6b6c7a787ffb9d6ac9b34c5f6..ac692f7754228d19459bcaa8481fa067f78572bb 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -25,9 +25,13 @@ endif
 bindings-install: $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
        $(INSTALL) -m 0644 $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
 
+LUA_HAS_SETFUNCS := \
+       $(shell pkg-config luajit --atleast-version=2.1.0-beta3 && echo 1 || echo 0)
+
 kresd_CFLAGS := -fPIE \
                -Dlibknot_SONAME=\"$(libknot_SONAME)\" \
-               -Dlibzscanner_SONAME=\"$(libzscanner_SONAME)\"
+               -Dlibzscanner_SONAME=\"$(libzscanner_SONAME)\" \
+               -DLUA_HAS_SETFUNCS="$(LUA_HAS_SETFUNCS)"
 kresd_DEPEND := $(libkres) $(contrib)
 kresd_LIBS := $(libkres_TARGET) $(contrib_TARGET) $(libknot_LIBS) \
               $(libzscanner_LIBS) $(libdnssec_LIBS) $(libuv_LIBS) $(lua_LIBS) \