From 00125bdf588f081bad3cc8eccfc3838d652a0d50 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 14 Nov 2016 15:34:40 +0100
Subject: [PATCH] configure: move firewalld check to its own file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 configure.ac         | 17 +++--------------
 m4/virt-firewalld.m4 | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 m4/virt-firewalld.m4

diff --git a/configure.ac b/configure.ac
index b2fecc4b4a..268287762a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1062,19 +1062,8 @@ AM_CONDITIONAL([WITH_POLKIT1], [test "x$with_polkit1" = "xyes"])
 AC_SUBST([POLKIT_CFLAGS])
 AC_SUBST([POLKIT_LIBS])
 
-dnl firewalld
-LIBVIRT_ARG_WITH([FIREWALLD], [firewalld], [check])
-
-if test "x$with_firewalld" = "xcheck" ; then
-   with_firewalld=$with_dbus
-fi
-if test "x$with_firewalld" = "xyes" ; then
-  if test "x$with_dbus" != "xyes" ; then
-     AC_MSG_ERROR([You must have dbus enabled for firewalld support])
-  fi
-  AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled])
-fi
-AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"])
+LIBVIRT_ARG_FIREWALLD
+LIBVIRT_CHECK_FIREWALLD
 
 
 dnl UUCP style file locks for character devices
@@ -2354,6 +2343,7 @@ LIBVIRT_RESULT_CAPNG
 LIBVIRT_RESULT_CURL
 LIBVIRT_RESULT_DBUS
 LIBVIRT_RESULT_DLOPEN
+LIBVIRT_RESULT_FIREWALLD
 LIBVIRT_RESULT_FUSE
 LIBVIRT_RESULT_GLUSTER
 LIBVIRT_RESULT_GNUTLS
@@ -2372,7 +2362,6 @@ LIBVIRT_RESULT_SELINUX
 LIBVIRT_RESULT_SSH2
 LIBVIRT_RESULT_UDEV
 LIBVIRT_RESULT_YAJL
-AC_MSG_NOTICE([firewalld: $with_firewalld])
 if test "$with_polkit" = "yes" ; then
 if test "$with_polkit0" = "yes" ; then
 AC_MSG_NOTICE([  polkit: $POLKIT_CFLAGS $POLKIT_LIBS (version 0)])
diff --git a/m4/virt-firewalld.m4 b/m4/virt-firewalld.m4
new file mode 100644
index 0000000000..f0283049b5
--- /dev/null
+++ b/m4/virt-firewalld.m4
@@ -0,0 +1,43 @@
+dnl The firewalld support
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_ARG_FIREWALLD], [
+  LIBVIRT_ARG_WITH([FIREWALLD], [firewalld], [check])
+])
+
+AC_DEFUN([LIBVIRT_CHECK_FIREWALLD], [
+  AC_REQUIRE([LIBVIRT_CHECK_DBUS])
+
+  if test "x$with_firewalld" = "xcheck" ; then
+    with_firewalld=$with_dbus
+  fi
+
+  if test "x$with_firewalld" = "xyes" ; then
+    if test "x$with_dbus" != "xyes" ; then
+      AC_MSG_ERROR([You must have dbus enabled for firewalld support])
+    fi
+    AC_DEFINE_UNQUOTED([HAVE_FIREWALLD], [1], [whether firewalld support is enabled])
+  fi
+
+  AM_CONDITIONAL([HAVE_FIREWALLD], [test "x$with_firewalld" != "xno"])
+])
+
+AC_DEFUN([LIBVIRT_RESULT_FIREWALLD], [
+  LIBVIRT_RESULT_LIB([FIREWALLD])
+])