From 72ff9bd3e67e1fb9acc7cc7857944d5b25d3e9c5 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Oct 2011 09:55:02 +0200 Subject: configure.ac: disable systemd service by default Defaulting to "with systemd" causes problems for users who install MPD as an unprivileged user, and it breaks "make distcheck". It looks like enabling it by default creates too many practical problems for unexperienced users. With --with-systemdsystemunitdir (without a parameter), configure.ac attempts to auto-detect systemd. --- configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1c1a4b91f..9908e51fa 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,15 @@ AC_PROG_MAKE_SET PKG_PROG_PKG_CONFIG AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) + [], [with_systemdsystemunitdir=no]) +if test "x$with_systemdsystemunitdir" = xyes; then + AC_MSG_CHECKING(for systemd) + with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + if test -z "$with_systemdsystemunitdir"; then + AC_MSG_ERROR([Failed to detect systemd]) + fi + AC_MSG_RESULT([$with_systemdsystemunitdir]) +fi if test "x$with_systemdsystemunitdir" != xno; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi -- cgit v1.2.3