From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Sun, 14 Nov 2010 10:04:16 +0000 (-0200)
Subject: build-sys: dbus-glib is just required by gtk's systemadm
X-Git-Tag: v12~25
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=010e310f290928a0aec431af4d01ee09d29a031b;hp=8c4dd542afde23d21d736b24b5ab66c25ab091e8

build-sys: dbus-glib is just required by gtk's systemadm

do not fail if there is no dbus-glib and we're not building the gtk
frontend.
---

diff --git a/configure.ac b/configure.ac
index 12cdb0c1e..fc0fc90c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,10 +112,6 @@ PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
-AC_SUBST(DBUSGLIB_CFLAGS)
-AC_SUBST(DBUSGLIB_LIBS)
-
 have_selinux=no
 AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
 if test "x$enable_selinux" != "xno"; then
@@ -255,6 +251,12 @@ if test "x$enable_gtk" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
 
+if test "$have_gtk" = "yes"; then
+        PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
+        AC_SUBST(DBUSGLIB_CFLAGS)
+        AC_SUBST(DBUSGLIB_LIBS)
+fi
+
 AM_PROG_VALAC([0.9])
 AC_SUBST(VAPIDIR)
 AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)