meson: add pm_utils build option

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 5e524af1403f7b058b4ff18c1e8f691da5313bf8..6a51245a167616ecbb21f92d2e793a4b08b02b88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,12 +77,6 @@ AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
 AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"])
 AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"])
 
-# Check for compiler and library settings.
-
-LIBVIRT_ARG_PM_UTILS
-
-LIBVIRT_CHECK_PM_UTILS
-
 
 dnl
 dnl in case someone want to build static binaries
@@ -157,10 +151,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Configuration summary])
 AC_MSG_NOTICE([=====================])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([Libraries])
-AC_MSG_NOTICE([])
-LIBVIRT_RESULT_PM_UTILS
-AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Windows])
 AC_MSG_NOTICE([])
 LIBVIRT_WIN_RESULT_WINDRES

diff --git a/m4/virt-pm-utils.m4 b/m4/virt-pm-utils.m4
deleted file mode 100644 (file)
index 02bf41e..0000000
--- a/m4/virt-pm-utils.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl The pm-utils support 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_PM_UTILS], [
-  LIBVIRT_ARG_WITH([PM_UTILS], [use pm-utils for power management], [check])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_PM_UTILS], [
-  AC_REQUIRE([LIBVIRT_CHECK_DBUS])
-  AC_REQUIRE([LIBVIRT_CHECK_INIT_SCRIPT])
-
-  if test "$with_pm_utils" = "check"; then
-    with_pm_utils=yes
-    if test "$with_dbus" = "yes"; then
-      if test "$init_systemd" = "yes"; then
-        with_pm_utils=no
-      fi
-    fi
-  fi
-
-  if test "$with_pm_utils" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils])
-  fi
-  AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_PM_UTILS], [
-  LIBVIRT_RESULT_LIB([PM_UTILS])
-])

diff --git a/meson.build b/meson.build
index e7b9260dadc1fca5dec3930efbbf118b34fa78df..e7674fb3e7e463c274a3824731d07421409ce539 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2182,6 +2182,17 @@ if conf.has('WITH_LIBVIRTD') and host_machine.system() == 'linux'
   conf.set('WITH_NWFILTER', 1)
 endif
 
+if not get_option('pm_utils').disabled()
+  use_pm_utils = true
+  if dbus_dep.found() and init_script == 'systemd'
+    use_pm_utils = false
+  endif
+
+  if use_pm_utils
+    conf.set('WITH_PM_UTILS', 1)
+  endif
+endif
+
 
 # define top include directory
 
@@ -2280,6 +2291,7 @@ libs_summary = {
   'numaclt': numactl_dep.found(),
   'openwsman': openwsman_dep.found(),
   'pciaccess': pciaccess_dep.found(),
+  'pm_utils': conf.has('WITH_PM_UTILS'),
   'polkit': conf.has('WITH_POLKIT'),
   'rbd': rbd_dep.found(),
   'readline': readline_dep.found(),

diff --git a/meson_options.txt b/meson_options.txt
index 0e536a61d3228d6dbe1ad5d2a15dd7a4b05db068..2fdab2e6281532678a1c8ae1785e0c2622501b7c 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -99,3 +99,4 @@ option('loader_nvram', type: 'string', value: '', description: 'Pass list of pai
 option('login_shell', type: 'feature', value: 'auto', description: 'build virt-login-shell')
 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')