2 files changed, 50 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index b1fea6a2e..f703ea5e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,6 +362,18 @@ AC_RUN_IFELSE(
 AC_LANG_POP(C)
 fi      # $build = $target
 
+# check for bluetooth library
+bluetooth=0
+AC_CHECK_LIB(bluetooth, ba2str, bluetooth=1, bluetooth=0) 
+if test "$bluetooth" = 1
+then
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, true)
+  AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])
+else
+  AM_CONDITIONAL(HAVE_LIBBLUETOOTH, false)
+fi
+
+
 # libcurl
 LIBCURL_CHECK_CONFIG(,7.21.3,curl=1,curl=0)
 if test "$curl" = 1
@@ -1367,6 +1379,12 @@ then
   AC_MSG_NOTICE([NOTICE: libcurl not found.  http client support will not be compiled.])
 fi
 
+# bluetooth
+if test "x$bluetooth" = "x0"
+then
+  AC_MSG_NOTICE([NOTICE: bluetooth library not found.  bluetooth support will not be compiled.])
+fi
+
 #gnutls
 if test x$gnutls != xtrue
 then
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 4ace2bc1e..feff9d918 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -59,7 +59,6 @@ if LINUX
                 test_quota_compliance_wlan_asymmetric
 endif
 
-
 if LINUX
 install-exec-hook:
         $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true
@@ -67,6 +66,23 @@ else
 install-exec-hook:
 endif
 
+if LINUX
+if HAVE_LIBBLUETOOTH
+ AM_LDFLAGS = -lbluetooth
+ BT_BIN = gnunet-helper-transport-bluetooth
+ BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la
+endif
+endif
+
+if LINUX
+if HAVE_LIBBLUETOOTH
+install-exec-hook2:
+        $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true
+endif
+else
+install-exec-hook2:
+endif
+
 if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
 UNIX_PLUGIN_TEST = test_transport_api_unix 
@@ -118,6 +134,7 @@ libgnunettransport_la_LDFLAGS = \
 libexec_PROGRAMS = \
  $(WLAN_BIN) \
  $(WLAN_BIN_DUMMY) \
+ $(BT_BIN) \
  gnunet-service-transport 
 
 bin_PROGRAMS = \
@@ -150,6 +167,9 @@ gnunet_transport_wlan_receiver_SOURCES = \
 gnunet_transport_wlan_receiver_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+gnunet_helper_transport_bluetooth_SOURCES = \
+ gnunet-helper-transport-bluetooth.c
+
 gnunet_transport_SOURCES = \
  gnunet-transport.c         
 gnunet_transport_LDADD = \
@@ -312,6 +332,17 @@ libgnunet_plugin_transport_https_server_la_LDFLAGS = \
 libgnunet_plugin_transport_https_server_la_CFLAGS = \
  $(CFLAGS) -DBUILD_HTTPS 
 
+libgnunet_plugin_transport_bluetooth_la_SOURCES = \
+  plugin_transport_bluetooth.c plugin_transport_wlan.h
+libgnunet_plugin_transport_bluetooth_la_LIBADD = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+libgnunet_plugin_transport_bluetooth_la_LDFLAGS = \
+  $(GN_PLUGIN_LDFLAGS)
+
 if HAVE_TESTING
 check_PROGRAMS = \
  test_transport_testing_startstop \