On (16/04/14 18:26), Nikolai Kondrashov wrote:
On 04/16/2014 02:24 PM, Nikolai Kondrashov wrote:
>>your patch reminds me another issue in Makefile.am
>>
>>Use the same ifdef around:
>> systemdconf_DATA += \
>> src/sysv/systemd/journal.conf
>>
>>Because it does not make sense to install this file if sssd was not configured
>>with journald.
>
>Yes, it makes sense, I'll add that to the patch, thank you.
Please find a new version of the patch attached. It adds conditional install
of journal.conf.
Sincerely,
Nick
From b80bba20e92175e2e72791f8f8145b3747fa18d6 Mon Sep 17 00:00:00
2001
From: Nikolai Kondrashov <Nikolai.Kondrashov(a)redhat.com>
Date: Tue, 15 Apr 2014 17:33:08 +0300
Subject: [PATCH 1/1] build: Don't assume systemd implies journald
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.
---
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index e94d41b..3ebb54a 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 += \
--
1.9.1
ACK
LS