diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-26 09:41:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-26 09:41:30 -0400 |
| commit | 115dd554c5d0126c1b006f283f6411733b3a70b1 (patch) | |
| tree | adca43156b01fed9fab0e14f43dc57d536e3e9fc | |
| parent | c8024b633eeff6161292666b209b538fda9df4ab (diff) | |
| parent | 08e8c21b1f0acac5e023d05d59f175f2f5716288 (diff) | |
| download | tor-115dd554c5d0126c1b006f283f6411733b3a70b1.tar.gz tor-115dd554c5d0126c1b006f283f6411733b3a70b1.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | changes/bug16164 | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug16164 b/changes/bug16164 new file mode 100644 index 0000000000..fbb383c26d --- /dev/null +++ b/changes/bug16164 @@ -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. diff --git a/configure.ac b/configure.ac index a51c71e59a..952fc9fb01 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |