From af32e6660c08296d5fa955beecf1dfd759384535 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 1 May 2015 16:01:13 +0200
Subject: [PATCH] Don't link in readline with everything

Closes #2476
---
 configure.ac                  |  2 +-
 m4/pdns_check_readline.m4     | 12 ++++++++++++
 pdns/Makefile.am              |  2 +-
 pdns/dnsdistdist/Makefile.am  |  2 +-
 pdns/dnsdistdist/configure.ac |  2 +-
 pdns/dnsdistdist/populate     |  1 +
 6 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 m4/pdns_check_readline.m4

diff --git a/configure.ac b/configure.ac
index fae08413e1..80a014cbc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@ AC_CHECK_HEADERS(
 )
 
 
-AX_LIB_READLINE
+PDNS_CHECK_READLINE
 PDNS_CHECK_RAGEL
 PDNS_CHECK_LIBSODIUM
 
diff --git a/m4/pdns_check_readline.m4 b/m4/pdns_check_readline.m4
new file mode 100644
index 0000000000..c9db26c54e
--- /dev/null
+++ b/m4/pdns_check_readline.m4
@@ -0,0 +1,12 @@
+AC_DEFUN([PDNS_CHECK_READLINE], [
+  OLD_LIBS="$LIBS"
+  $LIBS=""
+  AX_LIB_READLINE
+  AC_SUBST([READLINE_LIBS], [$LIBS])
+  LIBS="$OLDLIBS"
+  AS_IF([test "$1" = "mandatory"],[
+    AS_IF([test x"$READLINE_LIBS" = "x"],[
+      AC_MSG_ERROR([readline support is mandatory])
+    ])
+  ])
+])
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e1f86e1433..88af92f456 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -585,7 +585,7 @@ dnsdist_LDFLAGS = \
 	$(AM_LDFLAGS) 
 
 dnsdist_LDADD = \
-	-lreadline -lrt \
+	$(READLINE_LIBS) -lrt \
 	$(LUA_LIBS) ${LIBSODIUM_LIBS} $(YAHTTP_LIBS)
 
 nsec3dig_SOURCES = \
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 8e5c01a111..d1fb73a638 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -55,6 +55,6 @@ dnsdist_LDFLAGS = \
 	-pthread 
 
 dnsdist_LDADD = \
-	-lreadline -lrt \
+	$(READLINE_LIBS) -lrt \
 	$(LUA_LIBS) $(YAHTTP_LIBS) ${LIBSODIUM_LIBS}
 
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 7d3d66dc6a..305970dc06 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -7,7 +7,7 @@ AC_PROG_CC
 AC_PROG_CXX
 PDNS_CHECK_LIBSODIUM
 AC_PROG_LIBTOOL
-AX_LIB_READLINE
+PDNS_CHECK_READLINE([mandatory])
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
 AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index 997bd5fb59..d79fca18d6 100755
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -11,6 +11,7 @@ ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc .
 
 mkdir m4
 ln -fs ../../../m4/pdns_check_libsodium.m4 m4/
+ln -fs ../../../m4/pdns_check_readline.m4 m4/
 ln -fs ../../../m4/ax_lib_readline.m4 m4/
 ln -fs ../../../m4/boost.m4 m4/
 ln -fs ../../../m4/pdns_with_lua.m4 m4/
-- 
2.47.2