mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-22 14:23:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.6'

Browse source
This commit is contained in:
Nick Mathewson 2015-05-26 09:41:30 -04:00
commit 115dd554c5
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])
TOR_SYSTEMD_CFLAGS="${SYSTEMD_CFLAGS}"
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])], [])
fi
AC_SUBST(TOR_SYSTEMD_CFLAGS)