From 24d025363c4a708c61acee26456a42a0b9a4b609 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 6 Oct 2009 16:32:23 -0400
Subject: Adding some pkg-config love to get things compiling all nice like.

---
 configure.ac | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 70ef98b..fc7fcab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,19 @@ AC_CONFIG_MACRO_DIR([m4])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+##############################
+# Dependencies
+##############################
+
+GLIB_REQUIRED_VERSION=2.18
+DBUS_REQUIRED_VERSION=0.76
+
+PKG_CHECK_MODULES(LIBINDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
+
+AC_SUBST(LIBINDICATOR_CFLAGS)
+AC_SUBST(LIBINDICATOR_LIBS)
+
 ##############################
 # Custom Junk
 ##############################
-- 
cgit v1.2.3


From fa946df247f0e16de3a355dd5696f4671277348a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 8 Oct 2009 12:18:23 -0400
Subject: Adding in a tests folder

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fc7fcab..db437a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,7 @@ AC_OUTPUT([
 Makefile
 libindicator/Makefile
 libindicator/indicator.pc
+tests/Makefile
 ])
 
 ###########################
-- 
cgit v1.2.3


From 605f74bd18652f40b619771e60978d6abd23c65f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 8 Oct 2009 17:02:06 -0400
Subject: Switch from GLib to GTK as that's what we really needed.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index db437a6..51706ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 # Dependencies
 ##############################
 
-GLIB_REQUIRED_VERSION=2.18
+GTK_REQUIRED_VERSION=2.18
 DBUS_REQUIRED_VERSION=0.76
 
-PKG_CHECK_MODULES(LIBINDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
+PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                 dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
 
 AC_SUBST(LIBINDICATOR_CFLAGS)
-- 
cgit v1.2.3


From 0b18e53f290d8c536f42ce2ee7d0c905e95e27f2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Sun, 11 Oct 2009 22:05:28 -0500
Subject: Making a tools directory

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 51706ef..fe4aec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,7 @@ Makefile
 libindicator/Makefile
 libindicator/indicator.pc
 tests/Makefile
+tools/Makefile
 ])
 
 ###########################
-- 
cgit v1.2.3


From f28c65a127b070d5ad6f78b1b4a77b43557aadb9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 14 Oct 2009 09:08:40 -0500
Subject: Adding in check for valgrind that we'll need for the test tools.

---
 configure.ac | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index fe4aec5..586807e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,16 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 AC_SUBST(LIBINDICATOR_CFLAGS)
 AC_SUBST(LIBINDICATOR_LIBS)
 
+##############################
+# Valgrind
+##############################
+
+PKG_CHECK_MODULES(VALGRIND, valgrind)
+
+AC_SUBST(VALGRIND_CFLAGS)
+AC_SUBST(VALGRIND_LIBS)
+
+
 ##############################
 # Custom Junk
 ##############################
-- 
cgit v1.2.3


From b98a4811a0b03335da1fad3d0e0bce08bdad2a00 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 28 Oct 2009 16:43:19 -0500
Subject: Removing valgrind as I want to clean this branch up and make another
 for that.

---
 configure.ac | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 586807e..fe4aec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,16 +33,6 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 AC_SUBST(LIBINDICATOR_CFLAGS)
 AC_SUBST(LIBINDICATOR_LIBS)
 
-##############################
-# Valgrind
-##############################
-
-PKG_CHECK_MODULES(VALGRIND, valgrind)
-
-AC_SUBST(VALGRIND_CFLAGS)
-AC_SUBST(VALGRIND_LIBS)
-
-
 ##############################
 # Custom Junk
 ##############################
-- 
cgit v1.2.3