Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 2 -- m4/virt-sysctl.m4 | 43 ------------------------------------------- meson.build | 6 ++++++ meson_options.txt | 1 + 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 m4/virt-sysctl.m4 diff --git a/configure.ac b/configure.ac index f5b567806e3..00b547b1a75 100644 --- a/configure.ac +++ b/configure.ac @@ -90,11 +90,9 @@ dnl Miscellaneous checks dnl LIBVIRT_ARG_TLS_PRIORITY -LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_TLS_PRIORITY -LIBVIRT_CHECK_SYSCTL_CONFIG dnl Need to test if pkg-config exists diff --git a/m4/virt-sysctl.m4 b/m4/virt-sysctl.m4 deleted file mode 100644 index 3a59e3e6e66..00000000000 --- a/m4/virt-sysctl.m4 +++ /dev/null @@ -1,43 +0,0 @@ -dnl sysctl config check -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_SYSCTL_CONFIG], [ - LIBVIRT_ARG_WITH([SYSCTL], [Whether to install sysctl configs], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_SYSCTL_CONFIG], [ - AC_MSG_CHECKING([for whether to install sysctl config]) - if test "$with_sysctl" = "yes" || test "$with_sysctl" = "check" - then - case $host in - *-*-linux*) - with_sysctl=yes - ;; - *) - if test "$with_sysctl" = "yes"; then - AC_MSG_ERROR([No sysctl configuration supported for $host]) - else - with_sysctl=no - fi - ;; - esac - fi - AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes") - AC_MSG_RESULT($with_sysctl) -]) diff --git a/meson.build b/meson.build index e7efcb82b9b..7de11d8bf38 100644 --- a/meson.build +++ b/meson.build @@ -2173,6 +2173,12 @@ if not get_option('pm_utils').disabled() endif endif +if not get_option('sysctl_config').disabled() and host_machine.system() == 'linux' + conf.set('WITH_SYSCTL', 1) +elif get_option('sysctl_config').enabled() + error('sysctl configuration is supported only on linux') +endif + # define top include directory diff --git a/meson_options.txt b/meson_options.txt index 7d18f80d61f..9da3455e788 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -100,3 +100,4 @@ option('login_shell', type: 'feature', value: 'auto', description: 'build virt-l option('nss', type: 'feature', value: 'auto', description: 'enable Name Service Switch plugin for resolving guest IP addresses') option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') +option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') -- 2.26.2
