From e74ab412afdec651878550085ac24b32398c34cc Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 3 Jan 2009 12:12:08 +0100 Subject: [PATCH] Add option for selecting DNS proxy support --- bootstrap-configure | 1 + configure.ac | 4 ++++ plugins/Makefile.am | 10 +++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bootstrap-configure b/bootstrap-configure index 5abeb4b..3a25cd3 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 39dbced..987b817 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 f2b280c..ac6714d 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 -- 1.7.9.5