[libvirt] [PATCH 36/89] configure: move pm-utils check to its own file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 18 +++---------------
m4/virt-pm-utils.m4 | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 15 deletions(-)
create mode 100644 m4/virt-pm-utils.m4
diff --git a/configure.ac b/configure.ac
index f6ec38bba9..1c115805b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,7 @@ LIBVIRT_ARG_WITH_ALT([CHRDEV_LOCK_FILES],
[location for UUCP style lock files for character devices ]
[(use auto for default paths on some platforms)],
[auto])
-LIBVIRT_ARG_WITH_ALT([PM_UTILS], [use pm-utils for power management], [check])
+LIBVIRT_ARG_PM_UTILS
dnl
dnl in case someone want to build static binaries
@@ -1058,19 +1058,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" =
"yes"])
dnl
dnl Should we build with pm-utils support?
dnl
-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"])
+LIBVIRT_CHECK_PM_UTILS
dnl check if the network driver should be compiled
@@ -1962,6 +1950,7 @@ LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
+LIBVIRT_RESULT_PM_UTILS
LIBVIRT_RESULT_POLKIT
LIBVIRT_RESULT_READLINE
LIBVIRT_RESULT_SANLOCK
@@ -1992,7 +1981,6 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS])
else
AC_MSG_NOTICE([ rbd: no])
fi
-AC_MSG_NOTICE([pm-utils: $with_pm_utils])
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Windows])
diff --git a/m4/virt-pm-utils.m4 b/m4/virt-pm-utils.m4
new file mode 100644
index 0000000000..654aba3cf3
--- /dev/null
+++ b/m4/virt-pm-utils.m4
@@ -0,0 +1,45 @@
+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_ALT([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])
+])
--
2.11.0