From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 21 Mar 2016 19:36:12 +0000 (+0100)
Subject: dnsdist: Libedit is always mandatory now
X-Git-Tag: dnsdist-1.0.0-beta1~33^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=289351c3c632a1f554783a5030a5886dee456ab5;p=thirdparty%2Fpdns.git

dnsdist: Libedit is always mandatory now
---

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index dfc24377d4..5124eb0a9c 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -10,7 +10,7 @@ AC_PROG_CXX
 PDNS_CHECK_LIBSODIUM
 DNSDIST_CHECK_RAGEL
 AC_PROG_LIBTOOL
-PDNS_CHECK_LIBEDIT([mandatory])
+PDNS_CHECK_LIBEDIT
 PDNS_CHECK_CLOCK_GETTIME
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
diff --git a/pdns/dnsdistdist/m4/pdns_check_libedit.m4 b/pdns/dnsdistdist/m4/pdns_check_libedit.m4
index 0d42407df2..5ceef796cd 100644
--- a/pdns/dnsdistdist/m4/pdns_check_libedit.m4
+++ b/pdns/dnsdistdist/m4/pdns_check_libedit.m4
@@ -1,9 +1,3 @@
 AC_DEFUN([PDNS_CHECK_LIBEDIT], [
-  PKG_CHECK_MODULES(LIBEDIT, libedit, [], [
-    AS_IF([test "$1" = "mandatory"],[
-      AS_IF([test x"$LIBEDIT_LIBS" = "x"],[
-        AC_MSG_ERROR([libedit support is mandatory])
-      ])
-    ])
-  ])
+  PKG_CHECK_MODULES(LIBEDIT, libedit)
 ])