[Pkg-telepathy-commits] [telepathy-mission-control-6] 112/280: Remove remnants of ConnMan integration, we now use GLib-Networking

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 685372e17c2e8d1208c7b090d3176c7e8ae000df
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov 4 18:42:21 2013 +0000

    Remove remnants of ConnMan integration, we now use GLib-Networking
    
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71230
    Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>
---
 configure.ac    | 1 -
 src/Makefile.am | 2 --
 2 files changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index da943f2..6a2f35a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,6 +272,5 @@ Configure summary:
     Features:
         Plugin API documentation.....:  ${enable_gtk_doc}
         Network Manager integration..:  ${have_nm}
-        ConnMan integration..........:  ${have_connman}
         Connectivity GSetting........:  ${enable_conn_setting}
 "
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c19b00..b89b973 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
 	   $(DBUS_CFLAGS) \
 	   $(GLIB_CFLAGS) \
 	   $(NETWORK_MANAGER_CFLAGS) \
-	   $(CONNMAN_CFLAGS) \
 	   -DG_LOG_DOMAIN=\"mcd\" \
 	   -DMCD_PLUGIN_LOADER_DIR=\"@libdir@/mission-control-plugins. at MCP_ABI_VERSION@\" \
 	   -DMC_DISABLE_DEPRECATED -I$(top_srcdir)
@@ -65,7 +64,6 @@ libmcd_convenience_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
-	$(CONNMAN_LIBS) \
 	$(NULL)
 
 noinst_LTLIBRARIES = libmcd-convenience.la

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git