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/google.c | 48 |
5 files changed, 0 insertions, 68 deletions
diff --git a/Makefile.am b/Makefile.am index b9cce98d..a2d5ce08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -243,7 +243,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-bluetooth \ --enable-ofono \ --enable-pacrunner \ - --enable-google \ --enable-client \ --enable-hh2serial-gps \ --enable-openconnect \ diff --git a/Makefile.plugins b/Makefile.plugins index 0859df37..841a2620 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -202,18 +202,6 @@ plugins_pacrunner_la_LDFLAGS = $(plugin_ldflags) endif endif -if GOOGLE -if GOOGLE_BUILTIN -builtin_modules += google -builtin_sources += plugins/google.c -else -plugin_LTLIBRARIES += plugins/google.la -plugin_objects += $(plugins_google_la_OBJECTS) -plugins_google_la_CFLAGS = $(plugin_cflags) -plugins_google_la_LDFLAGS = $(plugin_ldflags) -endif -endif - if POLKIT if POLKIT_BUILTIN builtin_modules += polkit diff --git a/bootstrap-configure b/bootstrap-configure index 4b5bbeb1..ef5214a5 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -24,7 +24,6 @@ fi --enable-openconnect=builtin \ --enable-openvpn=builtin \ --enable-pacrunner=builtin \ - --enable-google=builtin \ --enable-nmcompat=builtin \ --enable-polkit=builtin \ --enable-capng \ diff --git a/configure.ac b/configure.ac index 15a99c55..006533e3 100644 --- a/configure.ac +++ b/configure.ac @@ -219,12 +219,6 @@ AC_ARG_ENABLE(pacrunner, AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") AM_CONDITIONAL(PACRUNNER_BUILTIN, test "${enable_pacrunner}" = "builtin") -AC_ARG_ENABLE(google, - AC_HELP_STRING([--enable-google], [enable Google Public DNS support]), - [enable_google=${enableval}], [enable_google="no"]) -AM_CONDITIONAL(GOOGLE, test "${enable_google}" != "no") -AM_CONDITIONAL(GOOGLE_BUILTIN, test "${enable_google}" = "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/google.c b/plugins/google.c deleted file mode 100644 index 0afc31c7..00000000 --- a/plugins/google.c +++ /dev/null @@ -1,48 +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/plugin.h> -#include <connman/resolver.h> - -#define GOOGLE_DNS1 "8.8.8.8" -#define GOOGLE_DNS2 "8.8.4.4" - -static int google_init(void) -{ - connman_resolver_append_public_server(GOOGLE_DNS1); - connman_resolver_append_public_server(GOOGLE_DNS2); - - return 0; -} - -static void google_exit(void) -{ - connman_resolver_remove_public_server(GOOGLE_DNS2); - connman_resolver_remove_public_server(GOOGLE_DNS1); -} - -CONNMAN_PLUGIN_DEFINE(google, "Google Public DNS plugin", VERSION, - CONNMAN_PLUGIN_PRIORITY_LOW, google_init, google_exit) |