summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-01-03 12:12:08 +0100
committerMarcel Holtmann <marcel@holtmann.org>2009-01-03 12:12:08 +0100
commite74ab412afdec651878550085ac24b32398c34cc (patch)
tree9a89e35d5c0616bffa680dc76d1c9f1f4730fa14
parent18a1d464eceb21cfb1956f4991fa6d5ddc7b31c2 (diff)
downloadconnman-e74ab412afdec651878550085ac24b32398c34cc.tar.gz
connman-e74ab412afdec651878550085ac24b32398c34cc.tar.bz2
connman-e74ab412afdec651878550085ac24b32398c34cc.zip
Add option for selecting DNS proxy support
-rwxr-xr-xbootstrap-configure1
-rw-r--r--configure.ac4
-rw-r--r--plugins/Makefile.am10
3 files changed, 12 insertions, 3 deletions
diff --git a/bootstrap-configure b/bootstrap-configure
index 5abeb4b1..3a25cd3b 100755
--- 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 39dbced2..987b8175 100644
--- 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 f2b280c2..ac6714dd 100644
--- 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