Clean up C++2011 pull

  * Ignore a generate file
  * Detect libsodium ony with --enable-libsodium from the top-level
    configure (Closes #2469)
  * Link the m4 for libsodium detection during ./populate in
    pdns/dnsdistdist

diff --git a/configure.ac b/configure.ac
index cf82ab0e3f31a729d12b09f965466106c83a6b01..21ddf1230e10e130d038ca689430a0b871d462c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,8 +114,7 @@ AC_CHECK_HEADERS(
 )
 
 PDNS_CHECK_RAGEL
-PKG_CHECK_MODULES([libsodium], [libsodium])
-
+PDNS_CHECK_LIBSODIUM
 
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH

diff --git a/pdns/dnsdistdist/m4/pdns_check_libsodium.m4 b/m4/pdns_check_libsodium.m4
similarity index 100%
rename from pdns/dnsdistdist/m4/pdns_check_libsodium.m4
rename to m4/pdns_check_libsodium.m4

diff --git a/pdns/.gitignore b/pdns/.gitignore
index 83336db6a5c81064853468aa9f682d6a0ab5d1ad..5d54f52b677db0b324e5bfda6dc6ba731a5e3ad5 100644 (file)
--- a/pdns/.gitignore
+++ b/pdns/.gitignore
@@ -50,3 +50,4 @@ version_generated.h
 /pubsuffix.cc
 /calidns
 /dumresp
+/htmlfiles.h

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9a3571d594c464f6bddcd760b109d42e4f85ca63..10f381e9bf0726f16a68d6dfdc00df2a38558e5c 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -589,8 +589,8 @@ dnsdist_LDFLAGS = \
        $(AM_LDFLAGS) 
 
 dnsdist_LDADD = \
-       -lreadline -lrt -ltermcap \
-       $(LUA_LIBS) ${libsodium_LIBS} $(YAHTTP_LIBS)
+       -lreadline -lrt \
+       $(LUA_LIBS) ${LIBSODIUM_LIBS} $(YAHTTP_LIBS)
 
 nsec3dig_SOURCES = \
        base32.cc \

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index 59c7b633f6a86860ed46dad005787576724b6e73..133737f3a7a9ed4734acd256955693f85be9a5d0 100755 (executable)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -9,6 +9,8 @@ ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc .
 ../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc ../sodcrypto.hh \
 ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc .
 
+ln -fs ../../m4/pdns_check_libsodium.m4 m4/
+
 ln -fs ../README-dnsdist.md README.md
 ln -fs ../dnsdistconf.lua .