diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 18:42:21 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-07 18:08:11 +0000 |
commit | 685372e17c2e8d1208c7b090d3176c7e8ae000df (patch) | |
tree | ad06d263c7d2b9ad4737d2f07e77881400560d21 | |
parent | e8f4f28d377b202d83e08e8b5d09130984edbcfb (diff) |
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@collabora.co.uk>
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index da943f23..6a2f35aa 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 3c19b00e..b89b9734 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.@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 |