From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 22 Apr 2015 13:29:28 +0000 (+0200)
Subject: dnsdist: no termcap linking, libsodium is optional
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~88^2~10^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49ba89933b87bbd5a141b8ba71b0b90a0f5fd0ca;p=pdns

dnsdist: no termcap linking, libsodium is optional
---

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 840714f05..f3f0a4ea5 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -44,6 +44,6 @@ dnsdist_LDFLAGS = \
 	-pthread 
 
 dnsdist_LDADD = \
-	-lreadline -lrt -ltermcap \
-	$(LUA_LIBS) $(YAHTTP_LIBS) ${libsodium_LIBS}
+	-lreadline -lrt \
+	$(LUA_LIBS) $(YAHTTP_LIBS) ${LIBSODIUM_LIBS}
 
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 958813eff..1fb994808 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_CC
 AC_PROG_CXX
-PKG_CHECK_MODULES([libsodium], [libsodium], [AC_DEFINE([HAVE_LIBSODIUM], [1], [Define to 1 if you have libsodium])], [true])
+PDNS_CHECK_LIBSODIUM
 AC_PROG_LIBTOOL
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
diff --git a/pdns/dnsdistdist/m4/pdns_check_libsodium.m4 b/pdns/dnsdistdist/m4/pdns_check_libsodium.m4
new file mode 100644
index 000000000..92a52f623
--- /dev/null
+++ b/pdns/dnsdistdist/m4/pdns_check_libsodium.m4
@@ -0,0 +1,19 @@
+AC_DEFUN([PDNS_CHECK_LIBSODIUM], [
+  AC_MSG_CHECKING([whether we will be linking in libsodium])
+  AC_ARG_ENABLE([libsodium],
+    AS_HELP_STRING([--enable-libsodium],[use libsodium @<:@default=no@:>@]),
+    [enable_libsodium=$enableval],
+    [enable_libsodium=no],
+  )
+  AC_MSG_RESULT([$enable_libsodium])
+
+  AM_CONDITIONAL([LIBSODIUM], [test "x$enable_libsodium" != "xno"])
+
+  AM_COND_IF([LIBSODIUM], [
+    PKG_CHECK_MODULES([LIBSODIUM], [libsodium], [
+      AC_DEFINE([HAVE_LIBSODIUM], [1], [Define to 1 if you have libsodium])
+    ],[
+      AC_MSG_ERROR([libsodium requested but not available])
+    ])
+  ])
+])