diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.plugins | 12 | ||||
| -rwxr-xr-x | bootstrap-configure | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | plugins/meego.c | 43 |
5 files changed, 0 insertions, 63 deletions
diff --git a/Makefile.am b/Makefile.am index 2cd7d93d..2e76233d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -244,7 +244,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-ofono \ --enable-pacrunner \ --enable-google \ - --enable-meego \ --enable-client \ --enable-hh2serial-gps \ --enable-openconnect \ diff --git a/Makefile.plugins b/Makefile.plugins index 13715187..0859df37 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -214,18 +214,6 @@ plugins_google_la_LDFLAGS = $(plugin_ldflags) endif endif -if MEEGO -if MEEGO_BUILTIN -builtin_modules += meego -builtin_sources += plugins/meego.c -else -plugin_LTLIBRARIES += plugins/meego.la -plugin_objects += $(plugins_meego_la_OBJECTS) -plugins_meego_la_CFLAGS = $(plugin_cflags) -plugins_meego_la_LDFLAGS = $(plugin_ldflags) -endif -endif - if POLKIT if POLKIT_BUILTIN builtin_modules += polkit diff --git a/bootstrap-configure b/bootstrap-configure index 12646a25..4b5bbeb1 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -25,7 +25,6 @@ fi --enable-openvpn=builtin \ --enable-pacrunner=builtin \ --enable-google=builtin \ - --enable-meego=builtin \ --enable-nmcompat=builtin \ --enable-polkit=builtin \ --enable-capng \ diff --git a/configure.ac b/configure.ac index cbfde698..15a99c55 100644 --- a/configure.ac +++ b/configure.ac @@ -225,12 +225,6 @@ AC_ARG_ENABLE(google, AM_CONDITIONAL(GOOGLE, test "${enable_google}" != "no") AM_CONDITIONAL(GOOGLE_BUILTIN, test "${enable_google}" = "builtin") -AC_ARG_ENABLE(meego, - AC_HELP_STRING([--enable-meego], [enable MeeGo features support]), - [enable_meego=${enableval}], [enable_meego="no"]) -AM_CONDITIONAL(MEEGO, test "${enable_meego}" != "no") -AM_CONDITIONAL(MEEGO_BUILTIN, test "${enable_meego}" = "builtin") - AC_CHECK_HEADERS(resolv.h, dummy=yes, AC_MSG_ERROR(resolver header files are required)) AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ diff --git a/plugins/meego.c b/plugins/meego.c deleted file mode 100644 index f8d2f0f3..00000000 --- a/plugins/meego.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#define CONNMAN_API_SUBJECT_TO_CHANGE -#include <connman/timeserver.h> -#include <connman/plugin.h> - -#define MEEGO_NTP_SERVER "ntp.meego.com" - -static int meego_init(void) -{ - return __connman_timeserver_system_append(MEEGO_NTP_SERVER); -} - -static void meego_exit(void) -{ - __connman_timeserver_system_remove(MEEGO_NTP_SERVER); -} - -CONNMAN_PLUGIN_DEFINE(meego, "MeeGo features plugin", VERSION, - CONNMAN_PLUGIN_PRIORITY_LOW, meego_init, meego_exit) |