ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

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

This commit is contained in:
Martin Willi 2014-09-12 10:29:29 +02:00
parent e2d9f27c19
commit db8ae75bf6
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -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!])])

3
src/charon-systemd/Makefile.am
View File

@ -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)