recursor: allow building on openindiana

PowerDNS · Jun 8, 2016 · e10b652 · e10b652
1 parent 5b67925
commit e10b652
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/pdns/lua_hpp.mk b/pdns/lua_hpp.mk
@@ -0,0 +1,6 @@
+lua.hpp:
+	$(AM_V_GEN)echo 'extern "C" {' > $@
+	@echo '#include "lua.h"' >> $@
+	@echo '#include "lualib.h"' >> $@
+	@echo '#include "lauxlib.h"' >> $@
+	@echo '}' >> $@
diff --git a/pdns/recursordist/.gitignore b/pdns/recursordist/.gitignore
@@ -40,3 +40,4 @@
 /dnsmessage.pb.h
 /pdns-recursor.service
 /[email protected]
+/lua.hpp
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
@@ -46,6 +46,7 @@ EXTRA_DIST = \
 	effective_tld_names.dat \
 	epollmplexer.cc \
 	kqueuemplexer.cc \
+	lua_hpp.mk \
 	malloctrace.cc malloctrace.hh \
 	mtasker.cc \
 	mtasker_fcontext.cc mtasker_ucontext.cc \
@@ -133,6 +134,12 @@ pdns_recursor_SOURCES = \
 	ws-recursor.cc ws-recursor.hh \
 	zoneparser-tng.cc zoneparser-tng.hh
 
+if !HAVE_LUA_HPP
+BUILT_SOURCES += lua.hpp
+nodist_pdns_recursor_SOURCES = lua.hpp
+CLEANFILES += lua.hpp
+endif
+
 pdns_recursor_LDADD = \
 	$(YAHTTP_LIBS) \
 	$(JSON11_LIBS) \
@@ -250,3 +257,7 @@ systemdsystemunit_DATA = \
 	pdns-recursor.service \
 	[email protected]
 endif
+
+if !HAVE_LUA_HPP
+include lua_hpp.mk
+endif
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
@@ -38,6 +38,7 @@ AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
 AC_PROG_LIBTOOL
 
 PDNS_CHECK_OS
+PDNS_CHECK_NETWORK_LIBS
 
 # Boost Context was introduced in 1.51 (Aug 2012), but there was an immediate
 # API break in 1.52 (Nov 2012), so we only support that, and later.

diff --git a/pdns/recursordist/lua_hpp.mk b/pdns/recursordist/lua_hpp.mk
@@ -0,0 +1 @@
+../lua_hpp.mk
diff --git a/pdns/recursordist/m4/pdns_check_network_libs.m4 b/pdns/recursordist/m4/pdns_check_network_libs.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_network_libs.m4