From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 6 Jan 2014 13:25:19 +0000 (+0100)
Subject: Move zeromq check to separate macro
X-Git-Tag: rec-3.6.0-rc1~264^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2239e91bf39f02916cb362a073cb5bc401d06e50;p=thirdparty%2Fpdns.git

Move zeromq check to separate macro
---

diff --git a/configure.ac b/configure.ac
index c325824f98..b860d7268f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,21 +149,7 @@ PDNS_WITH_SYSTEM_POLARSSL
 PDNS_ENABLE_BOTAN
 PDNS_WITH_CRYPTOPP
 PDNS_ENABLE_REMOTEBACKEND_HTTP
-
-AC_ARG_ENABLE(remotebackend_zeromq, AS_HELP_STRING([--enable-remotebackend-zeromq],[enable ZeroMQ connector for remotebackend]),[enable_remotebackend_zeromq=yes], [enable_remotebackend_zeromq=no])
-AC_MSG_CHECKING(whether to enable ZeroMQ connector in remotebackend)
-AC_MSG_RESULT($enable_remotebackend_zeromq)
-AM_CONDITIONAL(REMOTEBACKEND_HTTP,test x"$enable_remotebackend_zeromq" = "xyes")
-if test "x$enable_remotebackend_zeromq" = "xyes"
-then
-        PKG_CHECK_MODULES(LIBZMQ, libzmq, HAVE_LIBZMQ=yes, AC_MSG_ERROR([Could not find libzmq]))
-        REMOTEBACKEND_ZEROMQ=yes
-        AC_SUBST(LIBZMQ_LIBS)
-        AC_SUBST(LIBZMQ_CFLAGS)
-        AC_DEFINE(HAVE_LIBZMQ,1,[If we have libzmq])
-        AC_DEFINE(REMOTEBACKEND_ZEROMQ,1,[If we want ZeroMQ connector])
-        AC_SUBST(REMOTEBACKEND_ZEROMQ)
-fi
+PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
 AC_MSG_CHECKING(whether we should build static binaries)
 
diff --git a/m4/pdns_enable_remotebackend_zeromq.m4 b/m4/pdns_enable_remotebackend_zeromq.m4
new file mode 100644
index 0000000000..ff6ce931a9
--- /dev/null
+++ b/m4/pdns_enable_remotebackend_zeromq.m4
@@ -0,0 +1,26 @@
+AC_DEFUN([PDNS_ENABLE_REMOTEBACKEND_ZEROMQ],[
+  AC_MSG_CHECKING([whether to enable ZeroMQ connector in remotebackend])
+  AC_ARG_ENABLE([remotebackend_zeromq],
+    AS_HELP_STRING([--enable-remotebackend-zeromq],
+      [enable ZeroMQ connector for remotebackend @<:@default=no@:>@]
+    ),
+    [enable_remotebackend_zeromq=yes],
+    [enable_remotebackend_zeromq=no]
+  )
+
+  AC_MSG_RESULT([$enable_remotebackend_zeromq])
+
+  AM_CONDITIONAL([REMOTEBACKEND_HTTP],[test "x$enable_remotebackend_zeromq" = "xyes"])
+  AC_SUBST(REMOTEBACKEND_ZEROMQ)
+  AS_IF([test "x$enable_remotebackend_zeromq" = "xyes"],
+    [PKG_CHECK_MODULES([LIBZMQ], [libzmq],
+      [
+        AC_DEFINE([HAVE_LIBZMQ], [1], [Define to 1 if you have libzmq])
+        AC_DEFINE([REMOTEBACKEND_ZEROMQ], [1], [Define to 1 if you have the ZeroMQ connector])
+        REMOTEBACKEND_ZEROMQ=yes
+      ],
+      [AC_MSG_ERROR([Could not find libzmq])]
+    )]
+  )
+])
+