From 30bfe7f6e6fd9bb910d801c521be7b36f0136abd Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Thu, 4 Feb 2016 16:58:48 +0100 Subject: [PATCH] Actually test for ragel during dnsdist configure --- pdns/dnsdistdist/Makefile.am | 2 +- pdns/dnsdistdist/configure.ac | 1 + pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index 2b9f05671f..f71fb7fbe9 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS=ext/yahttp dnslabeltext.cc: dnslabeltext.rl - ragel $< -o dnslabeltext.cc + $(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc BUILT_SOURCES=htmlfiles.h diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac index c72fb993d5..805eab41b5 100644 --- a/pdns/dnsdistdist/configure.ac +++ b/pdns/dnsdistdist/configure.ac @@ -6,6 +6,7 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC AC_PROG_CXX PDNS_CHECK_LIBSODIUM +DNSDIST_CHECK_RAGEL AC_PROG_LIBTOOL PDNS_CHECK_LIBEDIT([mandatory]) PDNS_CHECK_CLOCK_GETTIME diff --git a/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 b/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 new file mode 100644 index 0000000000..999a89eba0 --- /dev/null +++ b/pdns/dnsdistdist/m4/dnsdist_check_ragel.m4 @@ -0,0 +1,8 @@ +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 +]) -- 2.47.2