[folks/folks-0-1] Cut out unnecessary tp-glib version checking.

[Travis Reitter <treitter src gnome org>]

commit e7784b89ba8458e93e954b146b4abea9c194b673
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Sep 14 08:33:36 2010 -0700

    Cut out unnecessary tp-glib version checking.

 configure.ac          |   13 -------------
 tests/Makefile.am     |    5 +----
 tests/lib/Makefile.am |    8 +++-----
 3 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c57fc4..d6c8003 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,10 +68,6 @@ AC_SUBST([LT_AGE])
 
 GLIB_REQUIRED=2.24.0
 TP_GLIB_REQUIRED=0.11.15.1
-# FIXME: remove the machinery using this once it's safe to require this version
-# (be sure to remove the HAVE_TP_GLIB_FOR_TESTS conditionals in Makefile.am
-# files)
-TP_GLIB_TESTS_REQUIRED=0.11.14.1
 VALA_REQUIRED=0.9.6
 
 AM_PROG_VALAC([$VALA_REQUIRED])
@@ -118,15 +114,6 @@ BACKEND_DIR='$(libdir)/folks/$(FOLKS_MODULE_VERSION)/backends'
 AC_SUBST([BACKEND_DIR])
 
 # -----------------------------------------------------------
-# Tests
-# -----------------------------------------------------------
-
-PKG_CHECK_MODULES([TP_GLIB_FOR_TESTS],
-                  [telepathy-glib >= $TP_GLIB_TESTS_REQUIRED],
-                  [have_tp_glib_for_tests=true], [have_tp_glib_for_tests=false])
-AM_CONDITIONAL([HAVE_TP_GLIB_FOR_TESTS], [$have_tp_glib_for_tests])
-
-# -----------------------------------------------------------
 # Tools
 # -----------------------------------------------------------
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0b3cf15..bc8aad4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,9 @@
 SUBDIRS = \
     lib \
     tools \
+    telepathy \
     $(NULL)
 
-if HAVE_TP_GLIB_FOR_TESTS
-SUBDIRS += telepathy
-endif
-
 TESTS_ENVIRONMENT = \
     abs_top_builddir= abs_top_builddir@ \
     abs_top_srcdir= abs_top_srcdir@ \
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 61c997e..ba7cb9a 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,7 +1,5 @@
-SUBDIRS =
-
-if HAVE_TP_GLIB_FOR_TESTS
-SUBDIRS += telepathy
-endif
+SUBDIRS = \
+	telepathy \
+	$(NULL)
 
 -include $(top_srcdir)/git.mk