From 47bd0ee5afe38109771623335a5272f682432c5a Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 27 Apr 2009 23:59:46 -0700
Subject: Allow selective option for current built-in plugins

---
 bootstrap-configure |  6 +++---
 configure.ac        |  9 ++++++---
 plugins/Makefile.am | 13 +++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/bootstrap-configure b/bootstrap-configure
index 49e5a640..c58f7aa4 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -17,15 +17,15 @@ fi
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		--disable-datafiles \
-		--enable-loopback \
-		--enable-ethernet \
+		--enable-loopback=builtin \
+		--enable-ethernet=builtin \
 		--enable-wifi \
 		--enable-bluetooth \
 		--enable-modemmgr \
 		--enable-udhcp \
 		--enable-dhclient \
 		--enable-resolvconf \
-		--enable-dnsproxy \
+		--enable-dnsproxy=builtin \
 		--enable-novatel \
 		--enable-huawei \
 		--enable-hso \
diff --git a/configure.ac b/configure.ac
index daa40c39..2bcac75f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,11 +48,13 @@ AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
 
 AC_ARG_ENABLE(loopback, AC_HELP_STRING([--enable-loopback],
 		[enable loopback support]), [enable_loopback=${enableval}])
-AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" = "yes")
+AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no")
+AM_CONDITIONAL(LOOPBACK_BUILTIN, test "${enable_loopback}" = "builtin")
 
 AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--enable-ethernet],
 		[enable Ethernet support]), [enable_ethernet=${enableval}])
-AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" = "yes")
+AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no")
+AM_CONDITIONAL(ETHERNET_BUILTIN, test "${enable_ethernet}" = "builtin")
 
 AC_ARG_ENABLE(wifi, AC_HELP_STRING([--enable-wifi],
 		[enable WiFi support]), [enable_wifi=${enableval}])
@@ -117,7 +119,8 @@ 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")
+AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no")
+AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin")
 
 AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel],
 		[enable Novatel support]), [enable_novatel=${enableval}])
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 151adabd..2fb60174 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,13 +7,22 @@ builtin_modules =
 builtin_sources =
 
 if LOOPBACK
+if LOOPBACK_BUILTIN
 builtin_modules += loopback
 builtin_sources += loopback.c
+else
+plugin_LTLIBRARIES += loopback.la
+endif
 endif
 
 if ETHERNET
+if ETHERNET_BUILTIN
 builtin_modules += ethernet
 builtin_sources += ethernet.c inet.h inet.c
+else
+plugin_LTLIBRARIES += ethernet.la
+ethernet_la_SOURCES = ethernet.c inet.h inet.c
+endif
 endif
 
 if WIFI
@@ -83,8 +92,12 @@ resolvconf_la_CFLAGS = $(AM_CFLAGS) -DRESOLVCONF=\"@RESOLVCONF@\"
 endif
 
 if DNSPROXY
+if DNSPROXY_BUILTIN
 builtin_modules += dnsproxy
 builtin_sources += dnsproxy.c
+else
+plugin_LTLIBRARIES += dnsproxy.la
+endif
 endif
 
 if POLKIT
-- 
cgit v1.2.3