meson: add nwfilter build check

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 072aedf13df64e386fadfd5b36178d84c31d2c2f..5e524af1403f7b058b4ff18c1e8f691da5313bf8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"])
 
 LIBVIRT_ARG_PM_UTILS
 
-LIBVIRT_CHECK_NWFILTER
 LIBVIRT_CHECK_PM_UTILS
 
 

diff --git a/m4/virt-nwfilter.m4 b/m4/virt-nwfilter.m4
deleted file mode 100644 (file)
index 759059c..0000000
--- a/m4/virt-nwfilter.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-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"])
-])

diff --git a/meson.build b/meson.build
index e6ae835529a15ff73a771566aff8f19aab9904b1..e7b9260dadc1fca5dec3930efbbf118b34fa78df 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2176,6 +2176,12 @@ elif get_option('numad').enabled()
   error('You must have numactl enabled for numad support.')
 endif
 
+# nwfilter should only be compiled for linux, and only if the
+# libvirt daemon is also being compiled
+if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux'
+  conf.set('WITH_NWFILTER', 1)
+endif
+
 
 # define top include directory