summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-09-12 16:48:36 +0100
committerWill Thompson <will.thompson@collabora.co.uk>2011-09-12 16:48:36 +0100
commit1271aaa387c51c312ae2dd6bd0d7ba51ce6864cb (patch)
treed5e4c9c1b6a00b2c50f94dde75a5290e2e6d5136
parent3c9f0062919c91887930a197e7240d1e113e7c40 (diff)
downloadtelepathy-mission-control-1271aaa387c51c312ae2dd6bd0d7ba51ce6864cb.tar.gz
Remove unused CHANDLERS_DIR
I really hated Friends.
-rw-r--r--configure.ac10
-rw-r--r--tests/twisted/Makefile.am2
-rw-r--r--tests/twisted/chandlers/README4
3 files changed, 0 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index fd87fb19..4467ec98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,16 +156,6 @@ fi
AC_SUBST(ACCOUNTS_CACHE_DIR)
AC_DEFINE_UNQUOTED(ACCOUNTS_CACHE_DIR,"$ACCOUNTS_CACHE_DIR", [Directory for account/connection mapping for crash recovery])
-
-AC_ARG_WITH(chandlers_dir, AS_HELP_STRING([--with-chandlers-dir=<path>],[Directory for channel handlers]))
-if test -z "$with_chandlers_dir" ; then
- CHANDLERS_DIR="telepathy/managers"
-else
- CHANDLERS_DIR=$with_chandlers_dir
-fi
-AC_SUBST(CHANDLERS_DIR)
-AC_DEFINE_UNQUOTED(CHANDLERS_DIR,"$CHANDLERS_DIR", [Directory for channel handlers])
-
server_enabled="yes"
AC_MSG_CHECKING(whether to build the daemon)
AC_ARG_ENABLE(server,
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 3126d0a3..977c04fa 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -159,7 +159,6 @@ BASIC_TESTS_ENVIRONMENT = \
PYTHONPATH=@abs_top_srcdir@/tests/twisted:@abs_top_builddir@/tests/twisted \
MC_DEBUG=all \
MC_FILTER_PLUGIN_DIR=@abs_top_builddir@/tests/twisted/.libs \
- MC_CHANDLERS_DIR=@abs_top_srcdir@/tests/twisted/chandlers \
MC_ACCOUNT_DIR=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
XDG_CONFIG_HOME=@abs_top_builddir@/tests/twisted/tmp-$(TMPSUFFIX) \
XDG_CONFIG_DIRS=@abs_top_srcdir@/tests/twisted \
@@ -273,7 +272,6 @@ EXTRA_DIST = \
$(TWISTED_BASIC_TESTS) \
$(TWISTED_SEPARATE_TESTS) \
accounts/README \
- chandlers/README \
telepathy/clients/README \
telepathy/clients/AbiWord.client \
telepathy/clients/Logger.client \
diff --git a/tests/twisted/chandlers/README b/tests/twisted/chandlers/README
deleted file mode 100644
index 2980ceba..00000000
--- a/tests/twisted/chandlers/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains .chandler files used by Mission Control when it is run
-by twisted test. $MC_CHANDLERS_DIR is set to this directory in the twisted
-environment.
-