mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
Andrew Cooper
fd4a15b1f7
There are no more users, and we want to disuade people from introducing new
users just for sd_notify() and friends. Drop the dependency.
We still want the overall --with{,out}-systemd to gate the generation of the
service/unit/mount/etc files.
Rerun autogen.sh, and mark the dependency as removed in the build containers.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Christian Lindig <christian.lindig@cloud.com>
tools: (Actually) drop libsystemd as a dependency
When reinstating some of systemd.m4 between v1 and v2, I reintroduced a little
too much. While {c,o}xenstored are indeed no longer linked against
libsystemd, ./configure still looks for it.
Drop this too.
Fixes: ae26101f6b ("tools: Drop libsystemd as a dependency")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
master commit: ae26101f6b
master date: 2024-05-23 15:04:40 +0100
master commit: 6ef4fa1e7f
master date: 2024-05-30 12:15:25 +0100
110 lines
3.9 KiB
Plaintext
110 lines
3.9 KiB
Plaintext
# systemd.m4 - Macros to check for and enable systemd -*- Autoconf -*-
|
|
#
|
|
# Copyright (C) 2014 Luis R. Rodriguez <mcgrof@suse.com>
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
dnl Some optional path options
|
|
AC_DEFUN([AX_SYSTEMD_OPTIONS], [
|
|
AC_ARG_WITH(systemd,
|
|
AS_HELP_STRING([--with-systemd=DIR],
|
|
[set directory for systemd service files [PREFIX/lib/systemd/system]]),
|
|
[SYSTEMD_DIR="$withval"],[SYSTEMD_DIR=""])
|
|
AC_SUBST(SYSTEMD_DIR)
|
|
|
|
AC_ARG_WITH(systemd-modules-load,
|
|
AS_HELP_STRING([--with-systemd-modules-load=DIR],
|
|
[set directory for systemd modules load files [PREFIX/lib/modules-load.d/]]),
|
|
[SYSTEMD_MODULES_LOAD="$withval"], [SYSTEMD_MODULES_LOAD=""])
|
|
AC_SUBST(SYSTEMD_MODULES_LOAD)
|
|
])
|
|
|
|
AC_DEFUN([AX_ENABLE_SYSTEMD_OPTS], [
|
|
AX_ARG_DEFAULT_ENABLE([systemd], [Disable systemd support])
|
|
AX_SYSTEMD_OPTIONS()
|
|
])
|
|
|
|
AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [
|
|
AX_ARG_DEFAULT_DISABLE([systemd], [Enable systemd support])
|
|
AX_SYSTEMD_OPTIONS()
|
|
])
|
|
|
|
AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [
|
|
AS_IF([test "x$SYSTEMD_DIR" = x], [
|
|
dnl In order to use the line below we need to fix upstream systemd
|
|
dnl to properly ${prefix} for child variables in
|
|
dnl src/core/systemd.pc.in but this is a bit complex at the
|
|
dnl moment as they depend on another rootprefix, which can vary
|
|
dnl from prefix in practice. We provide our own definition as we
|
|
dnl *know* where systemd will dump this to, but this does limit
|
|
dnl us to stick to a non custom systemdsystemunitdir, to work
|
|
dnl around this we provide the additional configure option
|
|
dnl --with-systemd where you can specify the directory for the unit
|
|
dnl files. It would also be best to just extend the upstream
|
|
dnl pkg-config pkg.m4 with an AC_DEFUN() to do this neatly.
|
|
dnl SYSTEMD_DIR="`$PKG_CONFIG --define-variable=prefix=$PREFIX --variable=systemdsystemunitdir systemd`"
|
|
SYSTEMD_DIR="\$(prefix)/lib/systemd/system/"
|
|
], [])
|
|
|
|
AS_IF([test "x$SYSTEMD_DIR" = x], [
|
|
AC_MSG_ERROR([SYSTEMD_DIR is unset])
|
|
], [])
|
|
|
|
dnl There is no variable for this yet for some reason
|
|
AS_IF([test "x$SYSTEMD_MODULES_LOAD" = x], [
|
|
SYSTEMD_MODULES_LOAD="\$(prefix)/lib/modules-load.d/"
|
|
], [])
|
|
|
|
AS_IF([test "x$SYSTEMD_MODULES_LOAD" = x], [
|
|
AC_MSG_ERROR([SYSTEMD_MODULES_LOAD is unset])
|
|
], [])
|
|
])
|
|
|
|
AC_DEFUN([AX_CHECK_SYSTEMD], [
|
|
dnl Respect user override to disable
|
|
AS_IF([test "x$enable_systemd" != "xno"], [
|
|
AS_IF([test "x$systemd" = "xy" ], [
|
|
AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled])
|
|
systemd=y
|
|
AX_CHECK_SYSTEMD_LIBS()
|
|
],[
|
|
AS_IF([test "x$enable_systemd" = "xyes"],
|
|
[AC_MSG_ERROR([Unable to find systemd development library])],
|
|
[systemd=n])
|
|
])
|
|
],[systemd=n])
|
|
])
|
|
|
|
dnl Enables systemd by default and requires a --disable-systemd option flag
|
|
dnl to configure if you want to disable.
|
|
AC_DEFUN([AX_ENABLE_SYSTEMD], [
|
|
AX_ENABLE_SYSTEMD_OPTS()
|
|
AX_CHECK_SYSTEMD()
|
|
])
|
|
|
|
dnl Systemd will be disabled by default and requires you to run configure with
|
|
dnl --enable-systemd to look for and enable systemd.
|
|
AC_DEFUN([AX_ALLOW_SYSTEMD], [
|
|
AX_ALLOW_SYSTEMD_OPTS()
|
|
AX_CHECK_SYSTEMD()
|
|
])
|
|
|
|
dnl Systemd will be disabled by default but if your build system is detected
|
|
dnl to have systemd build libraries it will be enabled. You can always force
|
|
dnl disable with --disable-systemd
|
|
AC_DEFUN([AX_AVAILABLE_SYSTEMD], [
|
|
AX_ALLOW_SYSTEMD_OPTS()
|
|
AX_CHECK_SYSTEMD()
|
|
])
|