this restores being able to build recursor w/o Lua, and also continues Travis testing...

diff --git a/.travis.yml b/.travis.yml
index 93e5cce6faedd04794e7de2aef6822f767b68f94..a6ede2248e0c98f80b1b1694890d067f767c5841 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,8 +119,8 @@ script:
  - cd ..
  - ./build-scripts/dist-recursor
  - cd pdns/pdns-recursor-*/
- - LUA=1 ./configure
- - LUA=1 make -k -j 4
+ - ./configure
+ - make -k -j 4
  - cd ..
  - ln -s pdns-recursor*/pdns_recursor .
  - cd ..

diff --git a/build-scripts/dist-recursor b/build-scripts/dist-recursor
index 42e398c1bc6a195ebe6796ef9d85f8b919dd7523..ae6450129ad334466d9f9f0f3e70d91cbe789ad9 100755 (executable)
--- a/build-scripts/dist-recursor
+++ b/build-scripts/dist-recursor
@@ -38,7 +38,7 @@ ws-recursor.hh ws-api.hh secpoll-recursor.hh \
 responsestats.hh webserver.hh dnsname.hh dnspacket.hh ednssubnet.hh \
 filterpo.hh rpzloader.hh ixfr.hh gss_context.hh resolver.hh dnssecinfra.hh \
 dnsseckeeper.hh statbag.hh ueberbackend.hh sha.hh dnsbackend.hh comment.hh \
-validate.hh validate-recursor.hh sortlist.hh"
+validate.hh validate-recursor.hh sortlist.hh rec-lua-conf.hh sholder.hh"
 
 CFILES="syncres.cc iputils.cc  misc.cc unix_utility.cc qtype.cc \
 logger.cc arguments.cc  lwres.cc pdns_recursor.cc lua-iputils.cc \

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 7471413c6dae44cfd1d5de93ddeae3099cf88d1a..9c4c8c67cbc86b0962163142becf3b40ea91cceb 100644 (file)
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -1,4 +1,8 @@
+#include "config.h"
+#ifdef HAVE_LUA
 #include "ext/luawrapper/include/LuaContext.hpp"
+#endif
+
 #include <fstream>
 #include "namespaces.hh"
 #include "logger.hh"
@@ -24,6 +28,14 @@ LuaConfigItems::LuaConfigItems()
 {
 }
 
+#ifndef HAVE_LUA
+void loadRecursorLuaConfig(const std::string& fname)
+{
+  throw PDNSException("Asked to load a Lua configuration file '"+fname+"' in binary without Lua support");
+}
+#else
+
+
 void loadRecursorLuaConfig(const std::string& fname)
 {
   LuaConfigItems lci;
@@ -77,3 +89,5 @@ void loadRecursorLuaConfig(const std::string& fname)
   Lua.executeCode(ifs);
   g_luaconfs.setState(lci);
 }
+
+#endif