[gdm] configure: don't enable systemd journal if systemd is disabled
- From: Thomas Bechtold <toabctl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] configure: don't enable systemd journal if systemd is disabled
- Date: Fri, 8 Feb 2013 15:56:16 +0000 (UTC)
commit 3b6ab28ec5a754f1042d06a0851916fb8407725a
Author: Thomas Bechtold <thomasbechtold jpberlin de>
Date: Fri Feb 8 16:50:33 2013 +0100
configure: don't enable systemd journal if systemd is disabled
it's possible to fail the have_systemd check because systemd is too old,
but still pass the have_journald check because journald is available.
This commit ensures that doesn't happen because journald support depends
on systemd support.
configure.ac | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f5f5be..00f1cce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -954,11 +954,16 @@ PKG_CHECK_MODULES(JOURNALD,
[have_journald=yes], [have_journald=no])
if test "x$enable_systemd_journal" = "xauto" ; then
- if test x$have_journald = xno ; then
- use_journald=no
+ if test x$use_systemd = xyes ; then
+ if test x$have_journald = xno ; then
+ use_journald=no
+ else
+ use_journald=yes
+ fi
else
- use_journald=yes
+ use_journald=no
fi
+
else
use_journald="$enable_systemd_journal"
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]