Skip to content

Commit 207d03e

Browse files
committed
handle merge of libsystemd-journal -> libsystemd for systemd >= 209
see [1]: 'The APIs "sd-journal.h", "sd-login.h", "sd-id128.h", "sd-daemon.h" are no longer found in individual libraries libsystemd-journal.so, , libsystemd-login.so, libsystemd-id128.so, libsystemd-daemon.so. Instead, we have merged them into a single library, libsystemd.so, which provides all symbols. [1] http://cgit.freedesktop.org/systemd/systemd/tree/NEWS Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 parent 5fef418 commit 207d03e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,12 @@ if(SYSTEMD_FOUND)
9898
add_definitions(-DHAVE_SYSTEMD)
9999
set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_SYSTEMD)
100100

101-
pkg_check_modules(JOURNALD "libsystemd-journal")
101+
# libsystemd-journal was merged into libsystemd in 209
102+
if(${SYSTEMD_VERSION} VERSION_LESS 209)
103+
pkg_check_modules(JOURNALD "libsystemd-journal")
104+
else()
105+
pkg_check_modules(JOURNALD "libsystemd")
106+
endif()
102107

103108
if(ENABLE_JOURNALD)
104109
if(JOURNALD_FOUND)

0 commit comments

Comments
 (0)