From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 29 Apr 2015 06:59:04 +0000 (+0200)
Subject: Clean up C++2011 pull
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~87^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2470%2Fhead;p=thirdparty%2Fpdns.git

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 cf82ab0e3f..21ddf1230e 100644
--- 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 83336db6a5..5d54f52b67 100644
--- 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 9a3571d594..10f381e9bf 100644
--- 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 59c7b633f6..133737f3a7 100755
--- 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 .