From 8a495d461ba4c61724218c7e5b5be87dace7197f Mon Sep 17 00:00:00 2001
From: Travis Reitter <travis.reitter@collabora.co.uk>
Date: Mon, 8 Jul 2013 09:14:09 -0700
Subject: [PATCH] build: don't depend on tp-zeitgeist.vapi for
 --disable-zeitgeist

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=701099
---
 backends/telepathy/lib/Makefile.am | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 47a6a8f..472637b 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -178,10 +178,12 @@ libtp_zeitgeist_dummy_la_VALAFLAGS = \
 	-g \
 	$(NULL)
 
-dist_noinst_DATA += \
-	tp-zeitgeist.vapi \
-	tp-zeitgeist-dummy.vapi \
-	$(NULL)
+
+if ENABLE_ZEITGEIST
+dist_noinst_DATA += tp-zeitgeist.vapi
+else
+dist_noinst_DATA += tp-zeitgeist-dummy.vapi
+endif
 
 ##################################################################
 # Support library
@@ -191,7 +193,13 @@ pkgconfig_in = folks-telepathy.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in:.in=)
 
-$(srcdir)/libfolks_telepathy_la_vala.stamp: tp-lowlevel.vapi tp-zeitgeist.vapi tp-zeitgeist-dummy.vapi
+FOLKS_TP_VALA_DEPS = tp-lowlevel.vapi
+if ENABLE_ZEITGEIST
+FOLKS_TP_VALA_DEPS += tp-zeitgeist.vapi
+else
+FOLKS_TP_VALA_DEPS += tp-zeitgeist-dummy.vapi
+endif
+$(srcdir)/libfolks_telepathy_la_vala.stamp: $(FOLKS_TP_VALA_DEPS)
 
 libfolks_telepathy_la_SOURCES = \
 	tpf-namespace.vala \
-- 
2.7.4