diff --git a/Makefile b/Makefile index 5e6c0d39..40df8e3d 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/meson.build b/meson.build index 336e48f3..b454e349 100644 --- a/meson.build +++ b/meson.build @@ -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