systemd: Always require support for systemd

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

diff --git a/Makefile.am b/Makefile.am
index fae05e8aa3b0e22b825aa52888f77744c214a445..d016ba8995919e0762f9adfce4f9d632b6f7e0c4 100644 (file)
--- 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 17ef12942811dd93e3b82d0bb49a68c0765dcb50..d5505a3710960d1141e3ab6387294bd570a15406 100644 (file)
--- 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}
 ])