From 3abf91397a0e9276c322146f8eb94f4f293bbf81 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 19 Dec 2012 13:14:26 -0500
Subject: [PATCH 1/3] build: Drop redundant dependencies

gio-unix-2.0 depends on gio-2.0 which depends on glib-2.0 - we don't
need to duplicate the dependencies.  Likewise, polkit-gobject-1
depends on gio-2.0.
---
 configure.ac    |    9 ++++-----
 src/Makefile.am |    6 ------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c6e38e..bec2281 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,16 +25,15 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(GIO, gio-2.0 gio-unix-2.0)
-PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
+PKG_CHECK_MODULES(POLKIT, gio-unix-2.0 polkit-gobject-1)
 
 AM_MAINTAINER_MODE([enable])
 
 # client library dependencies
-LIBACCOUNTSSERVICE_LIBS="$GLIB_LIBS $GIO_LIBS"
+LIBACCOUNTSSERVICE_LIBS="$GIO_LIBS"
 AC_SUBST(LIBACCOUNTSSERVICE_LIBS)
-LIBACCOUNTSSERVICE_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS"
+LIBACCOUNTSSERVICE_CFLAGS="$GIO_CFLAGS"
 AC_SUBST(LIBACCOUNTSSERVICE_CFLAGS)
 
 GOBJECT_INTROSPECTION_CHECK([0.9.12])
diff --git a/src/Makefile.am b/src/Makefile.am
index c368c02..0b15fcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,6 @@ INCLUDES = 			\
 	-DDATADIR=\""$(datadir)"\" \
 	-DICONDIR=\"$(localstatedir)/lib/AccountsService/icons\" \
 	-DUSERDIR=\"$(localstatedir)/lib/AccountsService/users\" \
-	$(DBUS_GLIB_CFLAGS) 	\
-	$(GIO_CFLAGS)	 	\
-	$(GLIB_CFLAGS)		\
 	$(POLKIT_CFLAGS)	\
 	$(WARN_CFLAGS)
 
@@ -37,9 +34,6 @@ accounts_daemon_SOURCES = 	\
 	main.c
 
 accounts_daemon_LDADD = 	\
-	$(DBUS_GLIB_LIBS) 	\
-	$(GIO_LIBS)		\
-	$(GLIB_LIBS)		\
 	$(POLKIT_LIBS)
 
 CLEANFILES = $(BUILT_SOURCES)
-- 
1.7.1