centralise ragel check

diff --git a/configure.ac b/configure.ac
index 53fa76dd3bcf988e0b402b7b750d199b74db9040..e03561e129353673c384a2a01baf58fdfa3fef86 100644 (file)
--- 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 9a49823b01c90d7d492b74eb3466dd9827f15af7..f06c7d7b79caed4b7f1b782b7fcb508e565d3bf9 100644 (file)
--- 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 3378469738b9e158eac630e5e4cbfe9e636cbb62..a30e79c4f7e51880252f31df7efcddd37683b74c 100644 (file)
--- 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 (file)
index 999a89e..0000000
--- 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 (symlink)
index 0000000..6853d3b
--- /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 0e1e8379e72649cc87f48f757a27f51fc04b7df0..cc489370c16b4f75464f985dcb81ea6655f9ed40 100644 (file)
--- 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])