nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix --enable-systemd builds on systems with libsystemd but not systemd

Browse Source 
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
This commit is contained in:
Nick Mathewson 2015-05-26 09:39:53 -04:00
parent b3a225fb13
commit 08e8c21b1f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug16164 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Build with --enable-systemd correctly when libsystemd is installed,
but systemd is not. Fixes bug 16164, bugfix on 0.2.6.3-alpha. Patch
from Peter Palfrader.

2
configure.ac
View File

@ -131,7 +131,7 @@ if test x$have_systemd = xyes; then
AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd])
TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}" TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}"
TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}" TOR_SYSTEMD_LIBS="${SYSTEMD_LIBS}"
PKG_CHECK_MODULES(SYSTEMD209, [systemd >= 209], PKG_CHECK_MODULES(LIBSYSTEMD209, [libsystemd >= 209],
[AC_DEFINE(HAVE_SYSTEMD_209,1,[Have systemd v209 or more])], []) [AC_DEFINE(HAVE_SYSTEMD_209,1,[Have systemd v209 or more])], [])
fi fi
AC_SUBST(TOR_SYSTEMD_CFLAGS) AC_SUBST(TOR_SYSTEMD_CFLAGS)