Add option for selecting DNS proxy support

diff --git a/bootstrap-configure b/bootstrap-configure
index 5abeb4b1a2888d4c950c5f44fdc2da49b3639231..3a25cd3bb8a7bb5cdda21358dc00b51c367ae793 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -21,6 +21,7 @@ fi
                --enable-udhcp \
                --enable-dhclient \
                --enable-resolvconf \
+               --enable-dnsproxy \
                --enable-novatel \
                --enable-huawei \
                --enable-hso \

diff --git a/configure.ac b/configure.ac
index 39dbced2d6ff6154d189d51fe37f45aaebd8c2d2..987b817511785edf5fea3ea00c5467f9eacdcf17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,10 @@ if (test "${enable_resolvconf}" = "yes"); then
 fi
 AM_CONDITIONAL(RESOLVCONF, test "${enable_resolvconf}" = "yes")
 
+AC_ARG_ENABLE(dnsproxy, AC_HELP_STRING([--enable-dnsproxy],
+               [enable DNS proxy support]), [enable_dnsproxy=${enableval}])
+AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" = "yes")
+
 AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel],
                [enable Novatel support]), [enable_novatel=${enableval}])
 AM_CONDITIONAL(NOVATEL, test "${enable_novatel}" = "yes")

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f2b280c2ae2285eb929c42c5bb153615849a266e..ac6714ddcb0c777bcf3f7038115628229b1f95e0 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 
 plugindir = $(libdir)/connman/plugins
 
-plugin_LTLIBRARIES = ethernet.la bluetooth.la ipv4.la dnsproxy.la
+plugin_LTLIBRARIES = ethernet.la bluetooth.la ipv4.la
 
 if LOOPBACK
 plugin_LTLIBRARIES += loopback.la
@@ -64,8 +64,6 @@ pppd_la_SOURCES = pppd.c
 pppd_la_CFLAGS = @GLIB_CFLAGS@ -DPPPD=\"@PPPD@\"
 endif
 
-dnsproxy_la_SOURCES = dnsproxy.c
-
 if RESOLVCONF
 plugin_LTLIBRARIES += resolvconf.la
 
@@ -73,6 +71,12 @@ resolvconf_la_SOURCES = resolvconf.c
 resolvconf_la_CFLAGS = @GLIB_CFLAGS@ -DRESOLVCONF=\"@RESOLVCONF@\"
 endif
 
+if DNSPROXY
+plugin_LTLIBRARIES += dnsproxy.la
+
+dnsproxy_la_SOURCES = dnsproxy.c
+endif
+
 if POLKIT
 plugin_LTLIBRARIES += polkit.la