From 1b0f9ccac954c7f896879e66d6e909d686800e1b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 13 Sep 2025 09:18:02 +0000
Subject: [PATCH] systemd: Always require support for systemd

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am  |  6 +-----
 configure.ac | 33 ---------------------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fae05e8a..d016ba89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ pythondir  = $(prefix)/lib/python3/dist-packages
 
 configsdir = $(sysconfdir)/ipfire.org
 crondir    = $(sysconfdir)/cron.d
+systemdsystemunitdir = $(prefix)/lib/systemd/system
 
 CLEANFILES =
 DISTCLEANFILES =
@@ -20,9 +21,6 @@ EXTRA_DIST =
 INSTALL_DIRS =
 noinst_DATA =
 
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
 # ------------------------------------------------------------------------------
 
 bin_SCRIPTS = \
@@ -1225,7 +1223,6 @@ dist_cron_DATA = \
 
 # ------------------------------------------------------------------------------
 
-if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
 	src/systemd/ipfire.org-webapp-1.service \
 	src/systemd/ipfire.org-webapp-2.service \
@@ -1237,7 +1234,6 @@ CLEANFILES += \
 
 INSTALL_DIRS += \
 	$(systemdsystemunitdir)
-endif
 
 EXTRA_DIST += \
 	src/systemd/ipfire.org-webapp-1.service.in \
diff --git a/configure.ac b/configure.ac
index 17ef1294..d5505a37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,38 +78,6 @@ fi
 
 # ------------------------------------------------------------------------------
 
-AC_ARG_WITH([systemd],
-	AS_HELP_STRING([--with-systemd], [Enable systemd support.])
-)
-
-AS_IF([test "x$with_systemd" != "xno"],
-      [PKG_CHECK_MODULES(systemd, [libsystemd],
-      [have_systemd=yes], [have_systemd=no])],
-      [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"])
-
 datadir="${datadir}/ipfire.org"
 localedir="${datadir}/translations"
 
@@ -126,6 +94,5 @@ AC_MSG_RESULT([
 	datadir:		${datadir}
 	localedir:		${localedir}
 
-	systemd support		${have_systemd}
 	Python version:		${PYTHON_VERSION}
 ])
-- 
2.47.3