|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
From 4e7f42375a9aa860365e6007a53a357df60964f1 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
From: Craig Small <csmall@enc.com.au>
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
Date: Thu, 9 Jul 2015 22:12:10 +1000
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
Subject: [PATCH] build-sys: use merged systemd library
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
Since systemd 209 released in Feb 2014 three systemd libraries
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
including systemd-login have been merged. This change merely
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
checks for, and links to, the new library.
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
References:
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
https://bugs.debian.org/731256
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
---
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
configure.ac | 6 +++---
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
diff --git a/configure.ac b/configure.ac
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
index 612097f..48d4a59 100644
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
--- a/configure.ac
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
+++ b/configure.ac
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
@@ -150,10 +150,10 @@ AC_ARG_WITH([systemd],
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
[], [with_systemd=no]
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
)
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
if test "x$with_systemd" != xno; then
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
- PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login >= 206], [], [
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
- AC_CHECK_LIB(systemd-login, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [], [
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
+ AC_CHECK_LIB(systemd, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
if test "x$have_systemd" = xno; then
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
- AC_MSG_ERROR([systemd support missing/incomplete (requires >= 206)])
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
+ AC_MSG_ERROR([systemd support missing/incomplete (requires >= 209)])
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
fi
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
SYSTEMD_LIBS="-lsystemd-login"
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
])
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
--
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
2.9.3
|
|
![](https://seccdn.libravatar.org/avatar/19d6d588001879430ddcedc3493348b9f9f8f576126e024e810c392eff7da7a8?s=16&d=retro) |
7b0213a |
|