[libvirt PATCH 123/351] meson: add pm_utils build option

Pavel Hrdina phrdina at redhat.com
Wed Jul 22 15:13:57 UTC 2020


On Wed, Jul 22, 2020 at 04:50:01PM +0200, Peter Krempa wrote:
> On Thu, Jul 16, 2020 at 11:55:59 +0200, Pavel Hrdina wrote:
> > Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> > ---
> >  configure.ac        | 10 ----------
> >  m4/virt-pm-utils.m4 | 45 ---------------------------------------------
> >  meson.build         | 12 ++++++++++++
> >  meson_options.txt   |  1 +
> >  4 files changed, 13 insertions(+), 55 deletions(-)
> >  delete mode 100644 m4/virt-pm-utils.m4
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 90868fdb351..f5b567806e3 100644
> > --- 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
> > index 02bf41e627b..00000000000
> > --- 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 24e42b0c421..e7efcb82b9b 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -2162,6 +2162,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'
> 
> The original impl seems to ask whether 'systemd' is used as init script
> and not whether the systemd unit files have to be installed.
> 
> e.g. one could disable installation of the unit files but this one still
> must be set.

The original implementation is broken as I explained here [1].

In autoconf init_systemd should be with_init_script.

Pavel

[1] <https://www.redhat.com/archives/libvir-list/2020-July/msg01327.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200722/23b4cc97/attachment-0001.sig>


More information about the libvir-list mailing list