diff options
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | src/charon-systemd/Makefile.am | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 8af536722..db35409d6 100644 --- a/configure.ac +++ b/configure.ac @@ -941,13 +941,16 @@ if test x$systemd = xtrue; then AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)]) fi - 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) + PKG_CHECK_MODULES(systemd, [libsystemd >= 209], + [AC_SUBST(systemd_CFLAGS) + AC_SUBST(systemd_LIBS)], + [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 diff --git a/src/charon-systemd/Makefile.am b/src/charon-systemd/Makefile.am index 1b9ac150f..ee85d43d1 100644 --- a/src/charon-systemd/Makefile.am +++ b/src/charon-systemd/Makefile.am @@ -9,11 +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) \ + $(systemd_CFLAGS) $(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 \ - $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB) + $(systemd_LIBS) $(systemd_daemon_LIBS) $(systemd_journal_LIBS) -lm $(PTHREADLIB) $(DLLIB) |