Add option for selecting Bluetooth support

diff --git a/Makefile.am b/Makefile.am
index 57b9979..5f40b57 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-loopback \
                                --enable-ethernet \
                                --enable-wifi \
+                               --enable-bluetooth \
                                --enable-udhcp \
                                --enable-dhclient \
                                --enable-resolvconf \

diff --git a/bootstrap-configure b/bootstrap-configure
index aa13371..164c535 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -19,6 +19,7 @@ fi
                --enable-loopback \
                --enable-ethernet \
                --enable-wifi \
+               --enable-bluetooth \
                --enable-udhcp \
                --enable-dhclient \
                --enable-resolvconf \

diff --git a/configure.ac b/configure.ac
index f31adac..f9f9a8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ if (test "${enable_wifi}" = "yes"); then
 fi
 AM_CONDITIONAL(WIFI, test "${enable_wifi}" = "yes")
 
+AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--enable-bluetooth],
+               [enable Bluetooth support]), [enable_bluetooth=${enableval}])
+AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" = "yes")
+
 AC_ARG_WITH(udhcpc, AC_HELP_STRING([--with-udhcpc=PROGRAM],
        [specify location of udhcpc binary]), [path_udhcpc=${withval}])
 

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index e90f494..9b013ad 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 
 plugindir = $(libdir)/connman/plugins
 
-plugin_LTLIBRARIES = bluetooth.la ipv4.la
+plugin_LTLIBRARIES = ipv4.la
 
 if LOOPBACK
 plugin_LTLIBRARIES += loopback.la
@@ -22,8 +22,12 @@ wifi_la_SOURCES = wifi.c inet.h inet.c supplicant.h supplicant.c
 wifi_la_LIBADD = @GDBUS_LIBS@
 endif
 
+if BLUETOOTH
+plugin_LTLIBRARIES += bluetooth.la
+
 bluetooth_la_SOURCES = bluetooth.c inet.h inet.c
 bluetooth_la_LIBADD = @GDBUS_LIBS@
+endif
 
 if NOVATEL
 plugin_LTLIBRARIES += novatel.la