systemd: Discover and check systemd libraries with pkg-config during configure

diff --git a/configure.ac b/configure.ac
index b4c4d859e17c852f39e45a782d9b6f0293cc77d6..9d9a993a9ebffcfa995ac34087f9b973eb4b0f00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -869,6 +869,16 @@ if test x$xml = xtrue; then
        AC_SUBST(xml_LIBS)
 fi
 
+if test x$systemd = xtrue; then
+       PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon])
+       AC_SUBST(systemd_daemon_CFLAGS)
+       AC_SUBST(systemd_daemon_LIBS)
+
+       PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal])
+       AC_SUBST(systemd_journal_CFLAGS)
+       AC_SUBST(systemd_journal_LIBS)
+fi
+
 if test x$tss = xtrousers; then
        AC_CHECK_LIB([tspi],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([TrouSerS library libtspi not found])],[])
        AC_CHECK_HEADER([trousers/tss.h],,[AC_MSG_ERROR([TrouSerS header trousers/tss.h not found!])])

diff --git a/src/charon-systemd/Makefile.am b/src/charon-systemd/Makefile.am
index b9a251f6ce95bacf77c886c8d143237bee9b2595..1b9ac150f4e2b3d0626315a092554319441e41a2 100644 (file)
--- a/src/charon-systemd/Makefile.am
+++ b/src/charon-systemd/Makefile.am
@@ -9,10 +9,11 @@ charon_systemd_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libhydra \
        -I$(top_srcdir)/src/libcharon \
+       $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
        -DPLUGINS=\""${charon_plugins}\""
 
 charon_systemd_LDADD = \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libcharon/libcharon.la \
-       -lsystemd-daemon -lsystemd-journal -lm $(PTHREADLIB) $(DLLIB)
+       $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB)