From aefbd30eb589d856e3211d7299a59e0d6ad772ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Fri, 8 Jul 2011 14:34:45 +0100
Subject: configure.ac: Remove dbus service stuff

We do not need it anymore
---
 configure.ac | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1e882e6..94b0644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,17 +67,6 @@ fi
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
 ##############################
 # Custom Junk
 ##############################
-- 
cgit v1.2.3


From 7652767580f7b8be6761ccf5b5dc7a303d51348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <javier.jardon@codethink.co.uk>
Date: Fri, 8 Jul 2011 14:39:48 +0100
Subject: configure.ac: Add support for the new indicator3-0.4

---
 configure.ac | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 94b0644..8766b1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,13 +30,13 @@ LT_INIT
 ###########################
 
 GTK_REQUIRED_VERSION=3.0
-INDICATOR_REQUIRED_VERSION=0.3.0
+INDICATOR_REQUIRED_VERSION=0.3.90
 UPOWER_REQUIRED_VERSION=0.9.5
 
 PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION])
 PKG_CHECK_MODULES([INDICATOR],[
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-        indicator3 >= $INDICATOR_REQUIRED_VERSION
+        indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
 ])
 
 ###########################
@@ -54,16 +54,11 @@ AC_ARG_ENABLE([localinstall],
 # Indicator Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/3/"
-	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
-elif test "x$with_gtk" = x2; then
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
-else
-        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
-        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
-fi
+AS_IF([test "x$with_localinstall" = "xyes"],
+      [INDICATORDIR="${libdir}/indicators3/2/"
+       INDICATORICONSDIR="${datadir}/indicator-applet/icons/"],
+      [INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
+       INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`])
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
-- 
cgit v1.2.3