From b34bde262c8cf69fa235045108a0bc0309c63eac Mon Sep 17 00:00:00 2001 From: Mykola Kvach Date: Fri, 5 Dec 2025 18:07:15 +0200 Subject: [PATCH] systemd: fall back to default system-sleep dir without systemd-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keep the pkg-config lookup for SYSTEMD_SLEEP_DIR, but fall back to "$(prefix)/lib/systemd/system-sleep/" if the variable remains unset. This avoids reintroducing a build-time dependency on systemd-devel while still honoring the path provided by pkg-config when present. Fixes: e54a6cd6a1f3 ("systemd: Add hooks to stop/start xen-watchdog on suspend/resume") Reported-by: Marek Marczykowski-Górecki Suggested-by: Andrew Cooper Signed-off-by: Mykola Kvach Acked-by: Andrew Cooper --- m4/systemd.m4 | 2 +- tools/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index c47a25ef93..5fb5a7089e 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -81,7 +81,7 @@ AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ ], []) AS_IF([test "x$SYSTEMD_SLEEP_DIR" = x], [ - AC_MSG_ERROR([SYSTEMD_SLEEP_DIR is unset]) + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" ], []) ]) diff --git a/tools/configure b/tools/configure index 479c7c9a3c..6f69b0b526 100755 --- a/tools/configure +++ b/tools/configure @@ -10360,7 +10360,7 @@ fi if test "x$SYSTEMD_SLEEP_DIR" = x then : - as_fn_error $? "SYSTEMD_SLEEP_DIR is unset" "$LINENO" 5 + SYSTEMD_SLEEP_DIR="\$(prefix)/lib/systemd/system-sleep/" fi