denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Support systemd >= 209

Browse Source 
libsystemd-journal and libsystemd-daemon are now just
part of libsystemd.

Keep original systemd checks as a fallback.

Updates charon-systemd/Makefile.am accordingly.

Tested on:
- debian wheezy (systemd v44)
- ubuntu 15.10 (systemd v255).

Signed-off-by: Chris Patterson <[email protected]>

Closes strongswan/strongswan#24.
This commit is contained in:
Chris Patterson
2015-12-21 11:53:31 +01:00
committed by Tobias Brunner
parent 92b051bd4a
commit b15f987ddd
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+10 -7
View File
@@ -941,13 +941,16 @@ if test x$systemd = xtrue; then
AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)]) AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)])
fi fi
PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon]) PKG_CHECK_MODULES(systemd, [libsystemd >= 209],
AC_SUBST(systemd_daemon_CFLAGS) [AC_SUBST(systemd_CFLAGS)
AC_SUBST(systemd_daemon_LIBS) AC_SUBST(systemd_LIBS)],
[PKG_CHECK_MODULES(systemd_daemon, [libsystemd-daemon])
PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal]) AC_SUBST(systemd_daemon_CFLAGS)
AC_SUBST(systemd_journal_CFLAGS) AC_SUBST(systemd_daemon_LIBS)
AC_SUBST(systemd_journal_LIBS) PKG_CHECK_MODULES(systemd_journal, [libsystemd-journal])
AC_SUBST(systemd_journal_CFLAGS)
AC_SUBST(systemd_journal_LIBS)]
)
fi fi
if test x$tss = xtrousers; then if test x$tss = xtrousers; then
src/charon-systemd/Makefile.am
+2 -2
View File
@@ -9,11 +9,11 @@ charon_systemd_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra \ -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libcharon \ -I$(top_srcdir)/src/libcharon \
$(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \ $(systemd_CFLAGS) $(systemd_daemon_CFLAGS) $(systemd_journal_CFLAGS) \
-DPLUGINS=\""${charon_plugins}\"" -DPLUGINS=\""${charon_plugins}\""
charon_systemd_LDADD = \ charon_systemd_LDADD = \
$(top_builddir)/src/libstrongswan/libstrongswan.la \ $(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libhydra/libhydra.la \ $(top_builddir)/src/libhydra/libhydra.la \
$(top_builddir)/src/libcharon/libcharon.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)