[tor-commits] [tor/maint-0.2.6] Fix --enable-systemd builds on systems with libsystemd but not systemd

[nickm at torproject.org]

commit 08e8c21b1f0acac5e023d05d59f175f2f5716288
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 26 09:39:53 2015 -0400

    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.
---
 changes/bug16164 |    4 ++++
 configure.ac     |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug16164 b/changes/bug16164
new file mode 100644
index 0000000..fbb383c
--- /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 81ef2c7..156bb3f 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)