From 42f2e91730aef4052a2d8bd7f6e8fe4c789eb655 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 6 Mar 2025 14:36:31 +0000 Subject: [PATCH] configure: Don't automatically detect systemdunitdir This is no longer possible on newer versions of systemd where the variable has been removed from pkg-config. Signed-off-by: Michael Tremer --- Makefile.am | 1 + configure.ac | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95e84e1..a381d09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ SED_PROCESS = \ cron_dailydir = $(sysconfdir)/cron.daily databasedir = $(localstatedir)/lib/location pkgconfigdir = $(libdir)/pkgconfig +systemdsystemunitdir = $(prefix)/lib/systemd/system # Overwrite Python path pkgpythondir = $(pythondir)/location diff --git a/configure.ac b/configure.ac index af673a4..8fdefc6 100644 --- a/configure.ac +++ b/configure.ac @@ -178,26 +178,6 @@ AS_IF([test "x$with_systemd" != "xno"], [have_systemd=no] ) -AS_IF([test "x$have_systemd" = "xyes"], - [AC_MSG_CHECKING([for systemd system unit directory]) - AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)] - ) - - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) - - if test -n "$systemdsystemunitdir" -a "x$systemdsystemunitdir" != xno; then - AC_MSG_RESULT([$systemdsystemunitdir]) - else - AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)]) - fi - ], - [AS_IF([test "x$with_systemd" = "xyes"], - [AC_MSG_ERROR([Systemd support is enabled but no systemd has been found.]) - ]) -]) - AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$have_systemd" = "xyes"]) # ------------------------------------------------------------------------------ -- 2.39.5