[systemd-commits] 2 commits - configure.ac Makefile.am

[Lennart Poettering]

 Makefile.am  |    2 ++
 configure.ac |   16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 2fa47da53e922eebf4ca52ef2b7c6ece383a85ea
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Nov 15 18:42:34 2010 +0100

    build-sys: make check for libnotify explicit

diff --git a/Makefile.am b/Makefile.am
index f27bed2..a86639d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -931,6 +931,7 @@ systemd_gnome_ask_password_agent_SOURCES = \
 systemd_gnome_ask_password_agent_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUSGLIB_CFLAGS) \
+	$(LIBNOTIFY_CFLAGS) \
 	$(GTK_CFLAGS) \
 	-Wno-unused-variable \
 	-Wno-unused-function \
@@ -948,6 +949,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
 
 systemd_gnome_ask_password_agent_LDADD = \
 	$(DBUSGLIB_LIBS) \
+	$(LIBNOTIFY_LIBS) \
 	$(GTK_LIBS)
 
 systemd_tty_ask_password_agent_SOURCES = \
diff --git a/configure.ac b/configure.ac
index fc0fc90..5c6379c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
-        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gio-unix-2.0 libnotify ],
+        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gio-unix-2.0 ],
                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
         AC_SUBST(GTK_CFLAGS)
         AC_SUBST(GTK_LIBS)
@@ -255,6 +255,10 @@ if test "$have_gtk" = "yes"; then
         PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
         AC_SUBST(DBUSGLIB_CFLAGS)
         AC_SUBST(DBUSGLIB_LIBS)
+
+        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
+        AC_SUBST(LIBNOTIFY_CFLAGS)
+        AC_SUBST(LIBNOTIFY_LIBS)
 fi
 
 AM_PROG_VALAC([0.9])

commit 010e310f290928a0aec431af4d01ee09d29a031b
Author: Gustavo Sverzut Barbieri <barbieri at profusion.mobi>
Date:   Sun Nov 14 08:04:16 2010 -0200

    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 12cdb0c..fc0fc90 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)