Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-firewalld-zone.m4 | 45 --------------------------------------- meson.build | 7 ++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 m4/virt-firewalld-zone.m4 diff --git a/configure.ac b/configure.ac index 825d14c6384..086505d95f6 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_FIREWALLD_ZONE LIBVIRT_ARG_FUSE LIBVIRT_ARG_GLUSTER LIBVIRT_ARG_HAL @@ -136,7 +135,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER @@ -453,7 +451,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER diff --git a/m4/virt-firewalld-zone.m4 b/m4/virt-firewalld-zone.m4 deleted file mode 100644 index b67d1a0b2fb..00000000000 --- a/m4/virt-firewalld-zone.m4 +++ /dev/null @@ -1,45 +0,0 @@ -dnl firewalld_zone check - whether or not to install the firewall "libvirt" zone -dnl -dnl Copyright (C) 2019 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_ZONE], [ - LIBVIRT_ARG_WITH([FIREWALLD_ZONE], [Whether to install firewalld libvirt zone], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_FIREWALLD_ZONE], [ - AC_REQUIRE([LIBVIRT_CHECK_FIREWALLD]) - AC_MSG_CHECKING([for whether to install firewalld libvirt zone]) - - if test "x$with_firewalld_zone" = "xcheck" ; then - with_firewalld_zone=$with_firewalld - fi - - if test "x$with_firewalld_zone" = "xyes" ; then - if test "x$with_firewalld" != "xyes" ; then - AC_MSG_ERROR([You must have firewalld support enabled to enable firewalld-zone]) - fi - AC_DEFINE_UNQUOTED([WITH_FIREWALLD_ZONE], [1], [whether firewalld libvirt zone is installed]) - fi - - AM_CONDITIONAL([WITH_FIREWALLD_ZONE], [test "x$with_firewalld_zone" != "xno"]) - AC_MSG_RESULT($with_firewalld_zone) -]) - -AC_DEFUN([LIBVIRT_RESULT_FIREWALLD_ZONE], [ - LIBVIRT_RESULT([firewalld-zone], [$with_firewalld_zone]) -]) diff --git a/meson.build b/meson.build index 385a959e88b..573a414b846 100644 --- a/meson.build +++ b/meson.build @@ -1130,6 +1130,12 @@ if host_machine.system() != 'freebsd' endif endif +if not get_option('firewalld_zone').disabled() and conf.has('WITH_FIREWALLD') + conf.set('WITH_FIREWALLD_ZONE', 1) +elif get_option('firewalld_zone').enabled() + error('You must have firewalld support enabled to enable firewalld_zone') +endif + # define top include directory @@ -1161,6 +1167,7 @@ libs_summary = { 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), + 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index d9e614131cd..75417751dd6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -19,4 +19,5 @@ option('capng', type: 'feature', value: 'auto', description: 'cap-ng support') option('curl', type: 'feature', value: 'auto', description: 'curl support') option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewalld support') +option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2
