Use internal version of sd-daemon and drop libsystemd dependency

Needed due to external request for systemd to be able to log directly to dlog.
This change avoids creation of cyclic dependency that would be created in
that case.

Change-Id: I9c779f263e92f4f84b825d20e263296400fcbf05

diff --git a/Makefile.am b/Makefile.am
index c668b10..6a72e18 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = subdir-objects foreign
 BUILT_SOURCES = include/dlog.h
 
 AM_CFLAGS = -I$(srcdir)/include \
+        -DSD_DAEMON_DISABLE_MQ \
+       -I$(srcdir)/external/sd-daemon \
        $(DEBUG_CFLAGS) \
        -Werror \
        $(CAPI_BASE_COMMON_CFLAGS) \
@@ -50,17 +52,14 @@ bin_PROGRAMS += dlog_logger
 
 dlog_logger_CFLAGS =  \
        $(AM_CFLAGS) \
-       $(LIBSYSTEMD_CFLAGS) \
        -fPIE
 
-dlog_logger_LDADD =  \
-       $(LIBSYSTEMD_LIBS)
-
 dlog_logger_LDFLAGS = \
        $(AM_LDFLAGS) \
        -pie
 
 dlog_logger_SOURCES = \
+       external/sd-daemon/sd-daemon.c \
        src/logger/logger.c \
        src/shared/ptrs_list.c \
        src/shared/logcommon.c \

diff --git a/configure.ac b/configure.ac
index 4d8e0c2..a213196 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,6 @@ AC_CHECK_FUNCS([memset])
 
 PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES([CAPI_BASE_COMMON], [capi-base-common])
-PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
 
 AC_SUBST(TZ_SYS_ETC)
 

diff --git a/packaging/dlog.spec b/packaging/dlog.spec
index 3222666..1334d11 100644 (file)
--- a/packaging/dlog.spec
+++ b/packaging/dlog.spec
@@ -22,7 +22,6 @@ BuildRequires: libtool
 BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(libtzplatform-config)
-BuildRequires: pkgconfig(libsystemd)
 Requires(post): coreutils
 Requires(post): /usr/bin/systemctl
 Requires(postun): /usr/bin/systemctl

diff --git a/src/logger/logger.c b/src/logger/logger.c
index bc0135a..45ffd71 100644 (file)
--- a/src/logger/logger.c
+++ b/src/logger/logger.c
@@ -39,8 +39,8 @@
 #include <logpipe.h>
 #include <log_file.h>
 #include <logconfig.h>
-#include <systemd/sd-daemon.h>
 #include <ptrs_list.h>
+#include <sd-daemon.h>
 
 /**
  * @addtogroup DLOG_IMPLEMENTATION