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 <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 95e84e1d210a878a9e30b04a39300b0a2bcea68c..a381d09a49b3fbd1e2fa37c70a7ca84ae0004934 100644 (file)
--- 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 af673a467a289be29d0e260a3939dc9247fbb5b3..8fdefc6936c1e9b4fca45cee08117cf857292509 100644 (file)
--- 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"])
 
 # ------------------------------------------------------------------------------