[xen stable-4.21] systemd: fall back to default system-sleep dir without systemd-devel

[patchbot@xxxxxxx]

commit 76dc2d60719f28714b68c47d0a72c0844fa7b053
Author:     Mykola Kvach <mykola_kvach@xxxxxxxx>
AuthorDate: Fri Dec 5 18:07:15 2025 +0200
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Fri Mar 6 14:42:24 2026 +0100

    systemd: fall back to default system-sleep dir without systemd-devel
    
    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 <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
    Suggested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Mykola Kvach <mykola_kvach@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    (cherry picked from commit b34bde262c8cf69fa235045108a0bc0309c63eac)
---
 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 d460f25529..d6b3487737 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
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.21