[folks] testing: do not require telepathy

[Patrick Ohly <pohly src gnome org>]

commit 9064f78a3d57f1141eb67b247aa2627accf79e24
Author: Patrick Ohly <patrick ohly intel com>
Date:   Mon Mar 25 14:30:48 2013 +0100

    testing: do not require telepathy
    
    Previously, all testing was disabled when the Telepathy backend was
    disabled. That is too strict. For example, the EDS backend tests can
    work without it.
    
    Only the core folks tests and of course the Telepathy tests depend on
    the Telepathy backend and thus must be disabled when that backend is
    disabled.
    
    Adding the TP backend path to the FOLKS_BACKEND_PATH env variable
    must be conditional, otherwise there are errors about not finding that
    .so file when running the other tests.

 configure.ac      |    7 ++++---
 tests/Makefile.am |    3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d35e0f1..fa2ca06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,7 +370,10 @@ if test x$enable_ofono_backend = xyes; then
 fi
 
 # All of the backend libraries in our tree; to be used by the tests
-BACKEND_UNINST_PATH='$(BACKEND_KF):$(BACKEND_TP)'
+BACKEND_UNINST_PATH='$(BACKEND_KF)'
+AS_IF([test "x$enable_telepathy_backend" = "xyes"], [
+  BACKEND_UNINST_PATH="$BACKEND_UNINST_PATH:$(BACKEND_TP)"
+])
 AS_IF([test x$have_libsocialweb_backend = xyes], [
   LIBSOCIALWEB_BACKEND_UNINST_PATH='$(BACKEND_LIBSOCIALWEB)'
   BACKEND_UNINST_PATH="$BACKEND_UNINST_PATH:$LIBSOCIALWEB_BACKEND_UNINST_PATH"
@@ -438,8 +441,6 @@ AM_CONDITIONAL([ENABLE_INSPECT_TOOL], [test "$with_inspect_tool" = "yes"])
 AC_ARG_ENABLE([tests],
               AS_HELP_STRING([--enable-tests],[Enable building of tests]),
               [enable_tests=$enableval], [enable_tests=yes])
-AS_IF([test "$enable_tests" = "yes" -a "$enable_telepathy_backend" = "no"],
-      [AC_MSG_ERROR([The Telepathy backend must be enabled to build tests])])
 AM_CONDITIONAL([ENABLE_TESTS], [test x$enable_tests = xyes])
 
 # -----------------------------------------------------------
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc7f7be..10c0f56 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,11 +5,10 @@ SUBDIRS = \
        lib \
        key-file \
        tools \
-       folks \
        $(NULL)
 
 if ENABLE_TELEPATHY
-SUBDIRS += telepathy
+SUBDIRS += folks telepathy
 endif
 
 if ENABLE_LIBSOCIALWEB