configure: Remove systemd unit directory auto-detection

This no longer works in Debian 13, and we need systemd regardless.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index c13afb36b2e9d6f7f4d692e707d01f91f1686794..2f04929bf322777dbf6972081bdb8a0d6a6c032f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ SUBDIRS = . po
 configsdir = $(sysconfdir)/pakfire
 crondir = $(sysconfdir)/cron.d
 pythondir = /usr/lib/python3/dist-packages
+systemdsystemunitdir = $(prefix)/lib/systemd/system
 
 BUILT_SOURCES =
 CLEANFILES =
@@ -53,9 +54,6 @@ po/POTFILES.in: Makefile
                sed -e "s@$(abs_srcdir)/@@g" | \
                LC_COLLATE=C sort > $@
 
-DISTCHECK_CONFIGURE_FLAGS = \
-       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-
 # ------------------------------------------------------------------------------
 
 AM_V_XSLT   = $(AM_V_XSLT_$(V))
@@ -394,7 +392,6 @@ static_fontsdir = $(staticdir)/fonts
 
 # ------------------------------------------------------------------------------
 
-if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
        src/systemd/pakfire-web.service
 
@@ -403,7 +400,6 @@ CLEANFILES += \
 
 INSTALL_DIRS += \
        $(systemdsystemunitdir)
-endif
 
 EXTRA_DIST += \
        src/systemd/pakfire-web.service.in

diff --git a/configure.ac b/configure.ac
index 1119386f01454de51affef6aab366b36aa24fa2f..3c79a7ac5c7fab7e5f1b1fd445ddb0ea4232d818 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,40 +98,6 @@ AX_PYTHON_MODULE([tornado], [fatal])
 
 # ------------------------------------------------------------------------------
 
-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}/pakfire-build-service"
 localedir="${datadir}/translations"