[SSSD] [PATCH 1/1] BUILD: Don't assume systemd implies journald

Nikolai Kondrashov Nikolai.Kondrashov at redhat.com
Wed Apr 16 11:24:05 UTC 2014


On 04/15/2014 10:38 PM, Lukas Slebodnik wrote:
> On (15/04/14 17:47), Nikolai Kondrashov wrote:
>> Hi everyone,
>>
>> This fixes distcheck when configured with systemd, but without journald (e.g.
>> as done by Debian package), when journald library package is missing.
> This is because debian has separate package journal development header
> files: libsystemd-journal-dev
>
> Fedora has these files in package systemd-devel
>
>>
>> Sincerely,
>> Nick
>
>>From ce1f0d21ed9890d23f1a1a7dbf04cbcc5341a996 Mon Sep 17 00:00:00 2001
>> From: Nikolai Kondrashov <Nikolai.Kondrashov at 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.
>> ---
>> Makefile.am | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index ace2b65..cf486db 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
>>
>> --
>> 1.9.1
>>
>
> 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.

Sincerely,
Nick



More information about the sssd-devel mailing list