diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-26 09:39:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-26 09:39:53 -0400 |
| commit | 08e8c21b1f0acac5e023d05d59f175f2f5716288 (patch) | |
| tree | 26533cb3fe939b751f3c05c9bf333cefd82b71d4 | |
| parent | b3a225fb13d57125888bc6e2c84bdca9abce00f6 (diff) | |
| download | tor-08e8c21b1f0acac5e023d05d59f175f2f5716288.tar.gz tor-08e8c21b1f0acac5e023d05d59f175f2f5716288.zip | |
Fix --enable-systemd builds on systems with libsystemd but not systemd
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
| -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 81ef2c7649..156bb3f548 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) |