|
 |
f2f0d2 |
From c0d934651f0fb01687035c8750f0591ea8b5d0ee Mon Sep 17 00:00:00 2001
|
|
|
f2f0d2 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
f2f0d2 |
Date: Mon, 23 May 2016 14:28:40 +0200
|
|
|
f2f0d2 |
Subject: [PATCH] build: update pkg modules for systemd
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
systemd-journal was dropped in systemd-230
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
f2f0d2 |
---
|
|
|
f2f0d2 |
src/CMakeLists.txt | 14 +++++++-------
|
|
|
f2f0d2 |
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
f2f0d2 |
index 1d31602..36c9ce5 100644
|
|
|
f2f0d2 |
--- a/src/CMakeLists.txt
|
|
|
f2f0d2 |
+++ b/src/CMakeLists.txt
|
|
|
f2f0d2 |
@@ -4,14 +4,14 @@ include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
|
|
|
f2f0d2 |
include_directories(${PC_LIBREPORT_INCLUDE_DIRS})
|
|
|
f2f0d2 |
include_directories(${PC_ABRT_INCLUDE_DIRS})
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
-pkg_check_modules(PC_JOURNALD libsystemd-journal)
|
|
|
f2f0d2 |
+pkg_check_modules(PC_SYSTEMD libsystemd)
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
-if (PC_JOURNALD_FOUND)
|
|
|
f2f0d2 |
- include_directories(${PC_JOURNALD_INCLUDE_DIRS})
|
|
|
f2f0d2 |
+if (PC_SYSTEMD_FOUND)
|
|
|
f2f0d2 |
+ include_directories(${PC_SYSTEMD_INCLUDE_DIRS})
|
|
|
f2f0d2 |
add_definitions(-DHAVE_SYSTEMD=1)
|
|
|
f2f0d2 |
else()
|
|
|
f2f0d2 |
add_definitions(-DHAVE_SYSTEMD=0)
|
|
|
f2f0d2 |
-endif (PC_JOURNALD_FOUND)
|
|
|
f2f0d2 |
+endif (PC_SYSTEMD_FOUND)
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
set(AbrtChecker_SRCS configuration.c abrt-checker.c
|
|
|
f2f0d2 |
jthrowable_circular_buf.c jthread_map.c)
|
|
|
f2f0d2 |
@@ -27,8 +27,8 @@ set_target_properties(
|
|
|
f2f0d2 |
target_link_libraries(AbrtChecker ${PC_LIBREPORT_LIBRARIES})
|
|
|
f2f0d2 |
target_link_libraries(AbrtChecker ${PC_ABRT_LIBRARIES})
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
-if (PC_JOURNALD_FOUND)
|
|
|
f2f0d2 |
- target_link_libraries(AbrtChecker ${PC_JOURNALD_LIBRARIES})
|
|
|
f2f0d2 |
-endif (PC_JOURNALD_FOUND)
|
|
|
f2f0d2 |
+if (PC_SYSTEMD_FOUND)
|
|
|
f2f0d2 |
+ target_link_libraries(AbrtChecker ${PC_SYSTEMD_LIBRARIES})
|
|
|
f2f0d2 |
+endif (PC_SYSTEMD_FOUND)
|
|
|
f2f0d2 |
|
|
|
f2f0d2 |
install(TARGETS AbrtChecker DESTINATION ${JNIAGENTLIB_INSTALL_DIR})
|
|
|
f2f0d2 |
--
|
|
|
f2f0d2 |
2.21.0
|
|
|
f2f0d2 |
|