External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: move pm-utils check to its own file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-12 10:12:13 +01:00
parent 9461a9f94b
commit 71844322a4
2 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -410,7 +410,7 @@ LIBVIRT_ARG_WITH_ALT([CHRDEV_LOCK_FILES],
[location for UUCP style lock files for character devices ] [location for UUCP style lock files for character devices ]
[(use auto for default paths on some platforms)], [(use auto for default paths on some platforms)],
[auto]) [auto])
LIBVIRT_ARG_WITH_ALT([PM_UTILS], [use pm-utils for power management], [check]) LIBVIRT_ARG_PM_UTILS
dnl dnl
dnl in case someone want to build static binaries dnl in case someone want to build static binaries
@ -1058,19 +1058,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
dnl dnl
dnl Should we build with pm-utils support? dnl Should we build with pm-utils support?
dnl dnl
if test "$with_pm_utils" = "check"; then LIBVIRT_CHECK_PM_UTILS
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"])
dnl check if the network driver should be compiled dnl check if the network driver should be compiled
@ -1962,6 +1950,7 @@ LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
LIBVIRT_RESULT_PM_UTILS
LIBVIRT_RESULT_POLKIT LIBVIRT_RESULT_POLKIT
LIBVIRT_RESULT_READLINE LIBVIRT_RESULT_READLINE
LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SANLOCK
@ -1992,7 +1981,6 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS])
else else
AC_MSG_NOTICE([ rbd: no]) AC_MSG_NOTICE([ rbd: no])
fi fi
AC_MSG_NOTICE([pm-utils: $with_pm_utils])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([Windows])

45
m4/virt-pm-utils.m4 Normal file
View File

@ -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])
])