containers
/
conmon
mirror of https://github.com/containers/conmon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rahil Bhimjiani 2023-09-26 03:21:49 +05:30 committed by Peter Hunt
parent f2be46fefb
commit 3e103d612d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -38,10 +38,7 @@ override CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0) -DVERSION=\"$(VERSIO
# "pkg-config --exists" will error if the package doesn't exist. Make can only compare
# output of commands, so the echo commands are to allow pkg-config to error out, make to catch it,
# and allow the compilation to complete.
ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal) -D USE_JOURNALD=1
else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd)
override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd) -D USE_JOURNALD=1
endif

5
meson.build
View File

@ -47,10 +47,7 @@ else
libdl = cc.find_library('dl')
endif
sd_journal = dependency('libsystemd-journal', required : false)
if not sd_journal.found()
sd_journal = dependency('libsystemd', required : false)
endif
sd_journal = dependency('libsystemd', required : false)
if sd_journal.found()
add_project_arguments('-DUSE_JOURNALD=1', language : 'c')
endif