From eab2ebe5b34569ada5f5fda64b9e313b1d9cccca Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 22 Sep 2010 11:42:39 -0500
Subject: Adding a new library line for configure so that we don't end up with
 extra libs in the library.

---
 configure.ac    | 7 +++++++
 src/Makefile.am | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0ecea51..f1ae2ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,13 @@ PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
 
+PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                           dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
+                           dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+
+AC_SUBST(LIBRARY_CFLAGS)
+AC_SUBST(LIBRARY_LIBS)
+
 ###########################
 # GObject Introspection
 ###########################
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c4e7ae..091f0f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,12 +108,12 @@ libappindicator_la_LDFLAGS = \
 	-export-symbols-regex "^[^_d].*"
 
 libappindicator_la_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
+	$(LIBRARY_CFLAGS) \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"libappindicator\"
 
 libappindicator_la_LIBADD = \
-	$(INDICATOR_LIBS)
+	$(LIBRARY_LIBS)
 
 ##################################
 # DBus Specs
-- 
cgit v1.2.3