From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 15 Feb 2016 13:49:35 +0000 (+0100)
Subject: move re2 m4, only dnsdist uses it
X-Git-Tag: auth-4.0.0-alpha2~47^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5c75251277bdd302fef796a871568ddd77d169e;p=thirdparty%2Fpdns.git

move re2 m4, only dnsdist uses it
---

diff --git a/configure.ac b/configure.ac
index b29b3ec569..7c74206f56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,8 +254,6 @@ AM_CONDITIONAL([LDAP],[test "x$needldap" = "xyes"])
 PDNS_CHECK_SQLITE3
 AM_CONDITIONAL([SQLITE3], [test "x$needsqlite3" = "xyes"])
 
-PDNS_CHECK_RE2
-
 for a in $modules; do
   AC_MSG_CHECKING([whether we can build module "${a}"])
   if [[ -d "$srcdir/modules/${a}backend" ]]; then
diff --git a/m4/pdns_check_re2.m4 b/m4/pdns_check_re2.m4
deleted file mode 100644
index cfa6fb414d..0000000000
--- a/m4/pdns_check_re2.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_DEFUN([PDNS_CHECK_RE2], [
-  AC_MSG_CHECKING([if we should compile in libre2 for dnsdist])
-  AC_ARG_ENABLE([re2], [AS_HELP_STRING([--enable-re2],[enable libre2 @<:@default=no@:>@])],
-  	[enable_re2=$enableval],
-  	[enable_re2=no]
-  )
-  AC_MSG_RESULT([$enable_re2])
-  AS_IF([test "x$enable_re2" = "xyes"], [
-    PKG_CHECK_MODULES([RE2], [re2], [HAVE_RE2=1], [AC_MSG_ERROR([Could not find libre2])])
-  ], [HAVE_RE2=0])    
-  AM_CONDITIONAL([HAVE_RE2], [test "$HAVE_RE2" -eq 1])
-  AS_IF([test "$HAVE_RE2" -eq 1], [AC_DEFINE([HAVE_RE2], [1], [Define if using RE2.])])
-])
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 2124caaf37..fd23dcd9d5 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -29,10 +29,6 @@ if SQLITE3
 AM_CPPFLAGS += $(SQLITE3_CFLAGS)
 endif
 
-if HAVE_RE2
-AM_CPPFLAGS += $(RE2_CFLAGS)
-endif
-
 if LUA
 AM_CPPFLAGS +=$(LUA_CFLAGS)
 endif
diff --git a/pdns/dnsdistdist/m4/pdns_check_re2.m4 b/pdns/dnsdistdist/m4/pdns_check_re2.m4
deleted file mode 120000
index 60ec5f937e..0000000000
--- a/pdns/dnsdistdist/m4/pdns_check_re2.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../../m4/pdns_check_re2.m4
\ No newline at end of file
diff --git a/pdns/dnsdistdist/m4/pdns_check_re2.m4 b/pdns/dnsdistdist/m4/pdns_check_re2.m4
new file mode 100644
index 0000000000..e4a8c9ff63
--- /dev/null
+++ b/pdns/dnsdistdist/m4/pdns_check_re2.m4
@@ -0,0 +1,13 @@
+AC_DEFUN([PDNS_CHECK_RE2], [
+  AC_MSG_CHECKING([if we should compile in libre2 for dnsdist])
+  AC_ARG_ENABLE([re2], [AS_HELP_STRING([--enable-re2],[enable libre2 @<:@default=no@:>@])],
+    [enable_re2=$enableval],
+    [enable_re2=no]
+  )
+  AC_MSG_RESULT([$enable_re2])
+  AS_IF([test "x$enable_re2" = "xyes"], [
+    PKG_CHECK_MODULES([RE2], [re2], [HAVE_RE2=1], [AC_MSG_ERROR([Could not find libre2])])
+  ], [HAVE_RE2=0])
+  AM_CONDITIONAL([HAVE_RE2], [test "$HAVE_RE2" -eq 1])
+  AS_IF([test "$HAVE_RE2" -eq 1], [AC_DEFINE([HAVE_RE2], [1], [Define if using RE2.])])
+])