From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 1 Dec 2017 12:00:10 +0000 (+0100)
Subject: centralise ragel check
X-Git-Tag: rec-4.1.0~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29e13421a129bd7d6ca6c731eb75492b1ae2fbaf;p=thirdparty%2Fpdns.git

centralise ragel check
---

diff --git a/configure.ac b/configure.ac
index 53fa76dd3b..e03561e129 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ PDNS_CHECK_LIBCRYPTO([
 )
 PDNS_CHECK_LIBCRYPTO_ECDSA
 
-PDNS_CHECK_RAGEL
+PDNS_CHECK_RAGEL([pdns/dnslabeltext.cc], [www.powerdns.com])
 PDNS_CHECK_CLOCK_GETTIME
 
 BOOST_REQUIRE([1.35])
diff --git a/m4/pdns_check_ragel.m4 b/m4/pdns_check_ragel.m4
index 9a49823b01..f06c7d7b79 100644
--- a/m4/pdns_check_ragel.m4
+++ b/m4/pdns_check_ragel.m4
@@ -1,8 +1,8 @@
 AC_DEFUN([PDNS_CHECK_RAGEL], [
   AC_CHECK_PROG([RAGEL], [ragel], [ragel])
   if test "x$RAGEL" = "x"; then
-    if test ! -f "${srcdir}/pdns/dnslabeltext.cc"; then
-      AC_MSG_ERROR([ragel is missing and you don't have ${srcdir}/pdns/dnslabeltext.cc. Install ragel or download sources from www.powerdns.com])
+    if test ! -f "${srcdir}/$1"; then
+      AC_MSG_ERROR([ragel is missing and you don't have ${srcdir}/$1. Install ragel or download sources from $2])
     fi
   fi
 ])
diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 3378469738..a30e79c4f7 100644
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -14,7 +14,7 @@ LT_PREREQ([2.2.2])
 LT_INIT([disable-static])
 
 PDNS_CHECK_LIBSODIUM
-DNSDIST_CHECK_RAGEL
+PDNS_CHECK_RAGEL([dnslabeltext.cc], [www.dnsdist.org])
 PDNS_CHECK_LIBEDIT
 PDNS_CHECK_CLOCK_GETTIME
 
diff --git a/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 b/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4
deleted file mode 100644
index 999a89eba0..0000000000
--- a/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_DEFUN([DNSDIST_CHECK_RAGEL], [
-  AC_CHECK_PROG([RAGEL], [ragel], [ragel])
-  if test "x$RAGEL" = "x"; then
-    if test ! -f "${srcdir}/dnslabeltext.cc"; then
-      AC_MSG_ERROR([ragel is missing and you don't have ${srcdir}/dnslabeltext.cc. Install ragel or download sources from www.dnsdist.org])
-    fi
-  fi
-])
diff --git a/pdns/dnsdistdist/m4/pdns_check_ragel.m4 b/pdns/dnsdistdist/m4/pdns_check_ragel.m4
new file mode 120000
index 0000000000..6853d3bb18
--- /dev/null
+++ b/pdns/dnsdistdist/m4/pdns_check_ragel.m4
@@ -0,0 +1 @@
+../../../m4/pdns_check_ragel.m4
\ No newline at end of file
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 0e1e8379e7..cc489370c1 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -120,7 +120,7 @@ PDNS_CHECK_LIBDECAF
 PDNS_WITH_NET_SNMP
 
 # check for tools we might need
-PDNS_CHECK_RAGEL
+PDNS_CHECK_RAGEL([pdns/dnslabeltext.cc], [www.powerdns.com])
 PDNS_CHECK_CURL
 
 AC_CHECK_FUNCS([strcasestr])