From: bert hubert Date: Mon, 7 Dec 2015 13:57:06 +0000 (+0100) Subject: Merge pull request #3005 from rgacogne/dnsdist-luajit X-Git-Tag: dnsdist-1.0.0-alpha1~105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38fdd1c6156b0dfa23631cc58b4807d2f36f60d8;p=thirdparty%2Fpdns.git Merge pull request #3005 from rgacogne/dnsdist-luajit Add support for using LuaJIT in dnsdist --- 38fdd1c6156b0dfa23631cc58b4807d2f36f60d8 diff --cc pdns/dnsdistdist/configure.ac index 9fcb3957db,ae4bf1b4c0..a14f308f75 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@@ -11,10 -11,17 +11,18 @@@ PDNS_CHECK_READLINE([mandatory] PDNS_CHECK_CLOCK_GETTIME BOOST_REQUIRE([1.35]) BOOST_FOREACH +PDNS_ENABLE_UNIT_TESTS AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp']) AC_SUBST([YAHTTP_LIBS], ['-L$(top_builddir)/ext/yahttp/yahttp -lyahttp']) - DNSDIST_LUA + + PDNS_WITH_LUAJIT + AS_IF([test "x$with_luajit" = "xno"], [ + PDNS_WITH_LUA + ]) + AS_IF([test "x$LUAPC" = "x" -a "x$LUAJITPC" = "x"], [ + AC_MSG_ERROR([Neither Lua nor LuaJIT found, Lua support is not optional]) + ]) + AX_CXX_COMPILE_STDCXX_11(ext,mandatory) AC_DEFINE([HAVE_MBEDTLS2], [1], [Defined if mbed TLS version 2.x.x is used])