Merge pull request #7481 from rgacogne/ipcrypt

Add support for encrypting IP addresses #gdpr

diff --cc configure.ac
Simple merge

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/dnsdist-lua-bindings.cc
Simple merge

diff --cc pdns/dnsdist.cc
Simple merge

diff --cc pdns/dnsdistdist/Makefile.am
Simple merge

diff --cc pdns/dnsdistdist/configure.ac
index 1582f7d733e5be1988fd37ee0595e721c9594c7a,743784573b5e764a54515565e60c71fc8953c579..a8e175df4e3b09b58790d5657d1dd4b2dffe9c32
--- 1/pdns/dnsdistdist/configure.ac
--- 2/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@@ -51,13 -51,10 +51,15 @@@ AM_CONDITIONAL([HAVE_SYSTEMD], [ test x
  
  AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
  AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
+ AC_SUBST([IPCRYPT_CFLAGS], ['-I$(top_srcdir)/ext/ipcrypt'])
+ AC_SUBST([IPCRYPT_LIBS], ['$(top_builddir)/ext/ipcrypt/libipcrypt.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])