From c252d148fa8ab50aaaa8bbae7beb4d208025171d Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Tue, 15 Apr 2014 17:33:08 +0300 Subject: build: Don't assume systemd implies journald MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Don't add --with-syslog=journald to extra_distcheck_flags if configured with systemd (--with-initscript=systemd). Add it if configured with journald (--with-syslog=journald) instead. This fixes distcheck target when configured with systemd, but without journald. Don't install journal.conf helping with enabling journald logging, unless configured with journald (--with-syslog=journald), as it would be useless and misleading. Reviewed-by: Lukáš Slebodník --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e94d41bc0..3ebb54aed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ if HAVE_DEVSHM extra_distcheck_flags += --with-test-dir=/dev/shm endif -if HAVE_SYSTEMD_UNIT +if WITH_JOURNALD extra_distcheck_flags += --with-syslog=journald endif @@ -2198,8 +2198,10 @@ systemdconf_DATA = if HAVE_SYSTEMD_UNIT systemdunit_DATA += \ src/sysv/systemd/sssd.service +if WITH_JOURNALD systemdconf_DATA += \ src/sysv/systemd/journal.conf +endif else if HAVE_SUSE init_SCRIPTS += \ -- cgit