Skip to content

Commit 3e103d6

Browse files
rahilarioushaircommander
authored andcommitted
Remove checks for (long)deprecated libsystemd-journal in favor of libsystemd
https://bugzilla.redhat.com/show_bug.cgi?id=1350301#c2 Signed-off-by: Rahil Bhimjiani <rahil3108@gmail.com>
1 parent f2be46f commit 3e103d6

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) -DVERSION=\"$(VERSIO
3838
# "pkg-config --exists" will error if the package doesn't exist. Make can only compare
3939
# output of commands, so the echo commands are to allow pkg-config to error out, make to catch it,
4040
# and allow the compilation to complete.
41-
ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
42-
override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
43-
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal) -D USE_JOURNALD=1
44-
else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
41+
ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
4542
override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd)
4643
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D USE_JOURNALD=1
4744
endif

meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ else
4747
libdl = cc.find_library('dl')
4848
endif
4949

50-
sd_journal = dependency('libsystemd-journal', required : false)
51-
if not sd_journal.found()
52-
sd_journal = dependency('libsystemd', required : false)
53-
endif
50+
sd_journal = dependency('libsystemd', required : false)
5451
if sd_journal.found()
5552
add_project_arguments('-DUSE_JOURNALD=1', language : 'c')
5653
endif

0 commit comments

Comments
 (0)