[libvirt] [PATCH 35/89] configure: move nwfilter check to its own file

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 13 +------------ m4/virt-nwfilter.m4 | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 m4/virt-nwfilter.m4 diff --git a/configure.ac b/configure.ac index 2a0b71ba50..f6ec38bba9 100644 --- a/configure.ac +++ b/configure.ac @@ -284,6 +284,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NSS LIBVIRT_CHECK_NUMACTL +LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_READLINE @@ -1680,18 +1681,6 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) -dnl nwfilter should only be compiled for linux, and only if the -dnl libvirt daemon is also being compiled - -with_nwfilter=yes -if test "$with_libvirtd" = "no" || test "$with_linux" != "yes"; then - with_nwfilter=no -fi -if test "$with_nwfilter" = "yes" ; then - AC_DEFINE([WITH_NWFILTER], 1, [whether local network filter management driver is available]) -fi -AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) - dnl check if the interface driver should be compiled LIBVIRT_ARG_WITH([INTERFACE], [host interface driver], [check]) diff --git a/m4/virt-nwfilter.m4 b/m4/virt-nwfilter.m4 new file mode 100644 index 0000000000..759059cc8f --- /dev/null +++ b/m4/virt-nwfilter.m4 @@ -0,0 +1,32 @@ +dnl The nwfilter 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_CHECK_NWFILTER], [ + dnl nwfilter should only be compiled for linux, and only if the + dnl libvirt daemon is also being compiled + + with_nwfilter=yes + if test "$with_libvirtd" = "no" || test "$with_linux" != "yes"; then + with_nwfilter=no + fi + if test "$with_nwfilter" = "yes" ; then + AC_DEFINE([WITH_NWFILTER], 1, [whether local network filter management driver is available]) + fi + AM_CONDITIONAL([WITH_NWFILTER], [test "$with_nwfilter" = "yes"]) +]) -- 2.11.0