]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #7343 from rgacogne/dnsdist-dyngroup-smt
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Thu, 4 Apr 2019 09:26:24 +0000 (11:26 +0200)
committerGitHub <noreply@github.com>
Thu, 4 Apr 2019 09:26:24 +0000 (11:26 +0200)
dnsdist: Add addDynBlockSMT() support to dynBlockRulesGroup

1  2 
pdns/dnsdistdist/Makefile.am
pdns/dnsdistdist/configure.ac

Simple merge
index 1013e0d437682a6fe0f703f98b883440ea66df0c,158ba4e998bf961238929298cdce67ac784c04c3..1582f7d733e5be1988fd37ee0595e721c9594c7a
@@@ -53,14 -48,17 +53,19 @@@ AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_src
  AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
  
  PDNS_WITH_LUA([mandatory])
+ AS_IF([test "x$LUAPC" = "xluajit"], [
+   # export all symbols to be able to use the Lua FFI interface
+   AC_MSG_NOTICE([Adding -rdynamic to export all symbols for the Lua FFI interface])
+   LDFLAGS="$LDFLAGS -rdynamic"
+ ])
  PDNS_CHECK_LUA_HPP
  
 +AM_CONDITIONAL([HAVE_GNUTLS], [false])
 +AM_CONDITIONAL([HAVE_LIBSSL], [false])
  DNSDIST_ENABLE_DNS_OVER_TLS
 -DNSDIST_WITH_GNUTLS
 -DNSDIST_WITH_LIBSSL
  AS_IF([test "x$enable_dns_over_tls" != "xno"], [
 +  DNSDIST_WITH_GNUTLS
 +  DNSDIST_WITH_LIBSSL
    AS_IF([test "$HAVE_LIBSSL" = "1"], [
      # we need libcrypto if libssl is enabled
      PDNS_CHECK_LIBCRYPTO