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.

diff --git a/changes/bug16164 b/changes/bug16164
new file mode 100644 (file)
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 81ef2c76494ed78176d24246d81cf24d9d585163..156bb3f548bd50d6cf50c12c526b9afcf5ebff21 100644 (file)
--- 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)