dnsdist: no termcap linking, libsodium is optional

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 840714f0578afd1e2b4a2028eee1c126d8c38b0d..f3f0a4ea50d59037de25221cb2e4c4595f7694bd 100644 (file)
--- 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 958813effb6b738d28973c9a647b102d3912a8f9..1fb99480850ccdaf37c06ef870cb7997921966c9 100644 (file)
--- 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 (file)
index 0000000..92a52f6
--- /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])
+    ])
+  ])
+])