[libvirt PATCH 122/351] meson: add nwfilter build check

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 1 - m4/virt-nwfilter.m4 | 32 -------------------------------- meson.build | 6 ++++++ 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-nwfilter.m4 diff --git a/configure.ac b/configure.ac index 82c166b760d..90868fdb351 100644 --- 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 index 759059cc8f2..00000000000 --- 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 f09538bdf13..24e42b0c421 100644 --- a/meson.build +++ b/meson.build @@ -2156,6 +2156,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 -- 2.26.2