summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-01-03 12:59:19 +0100
committerMarcel Holtmann <marcel@holtmann.org>2009-01-03 12:59:19 +0100
commitff0c50794b063e961775fc8fbe4fe7277bd7102d (patch)
tree2f5ea35a00b6622852b3d46a947e543c4b7e24af
parent4113a9a26b4ecdef89de8006cbf9755cc8656e4f (diff)
downloadconnman-ff0c50794b063e961775fc8fbe4fe7277bd7102d.tar.gz
connman-ff0c50794b063e961775fc8fbe4fe7277bd7102d.tar.bz2
connman-ff0c50794b063e961775fc8fbe4fe7277bd7102d.zip
Add option for selecting Bluetooth support
-rw-r--r--Makefile.am1
-rwxr-xr-xbootstrap-configure1
-rw-r--r--configure.ac4
-rw-r--r--plugins/Makefile.am6
4 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 57b99799..5f40b57e 100644
--- 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 aa133719..164c535a 100755
--- 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 f31adace..f9f9a8a5 100644
--- 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 e90f4944..9b013ad2 100644
--- 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