--- folks-0.9.1/configure.ac	2013-02-18 04:29:38.000000000 +0100
+++ folks-0.9.1.patched/configure.ac	2013-04-18 23:15:28.824847639 +0200
@@ -128,6 +128,12 @@
 
 AM_CONDITIONAL([ENABLE_TELEPATHY], [test "x$enable_telepathy_backend" = "xyes"])
 
+AC_ARG_ENABLE(zeitgeist,
+        AC_HELP_STRING([--enable-zeitgeist],
+                       [ build Zeitgeist support in the Telepathy backend]),
+        enable_zeitgeist=$enableval,
+        enable_zeitgeist=yes )
+
 # Automatically check the dependencies for the libsocialweb backend
 SW_CLIENT_REQUIRED=0.25.20
 AC_ARG_ENABLE(libsocialweb-backend,
@@ -195,10 +201,13 @@
 
 TP_GLIB_REQUIRED=0.19.0
 AS_IF([test x$enable_telepathy_backend = xyes], [
-        PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])
+        PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])])
+
+AS_IF([test x$enable_zeitgeist = xyes], [
         PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED],
-	                   have_zeitgeist="yes",have_zeitgeist="no")])
-AS_IF([test "x$have_zeitgeist" == "xyes"], [
+                        have_zeitgeist="yes",have_zeitgeist="no")])
+AS_IF([test "x$have_zeitgeist" == "xyes" \
+        -a x$enable_zeitgeist = xyes -a x$enable_telepathy_backend = xyes], [
    ZEITGEIST_VALAFLAGS="-D HAVE_ZEITGEIST"
    AC_SUBST([ZEITGEIST_VALAFLAGS])
    ZEITGEIST_PKG="--pkg zeitgeist-1.0"
@@ -303,7 +312,7 @@
 
         AS_IF([test x$enable_telepathy_backend = xyes], [
           VALA_CHECK_PACKAGES([telepathy-glib])
-	  AS_IF([test "x$have_zeitgeist" == "xyes"], [
+	  AS_IF([test "x$have_zeitgeist" == "xyes" -a x$enable_zeitgeist = xyes], [
 	      VALA_CHECK_PACKAGES([zeitgeist-1.0])
 	  ])
         ])
@@ -682,6 +691,6 @@
         Libsocialweb backend........:  ${have_libsocialweb_backend}
         E-D-S backend...............:  ${enable_eds_backend}
         Ofono backend...............:  ${enable_ofono_backend}
-        Zeitgeist support...........:  ${have_zeitgeist}
+        Zeitgeist support...........:  ${enable_zeitgeist}
         Build tests.................:  ${enable_tests}
 "