Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 10688)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 10700)
@@ -40,5 +40,5 @@
 #include "ariba/overlay/OverlayBootstrap.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 // Attribute descriptors for SDP
@@ -58,5 +58,5 @@
 const char *service_prov = "ITM Uni Karlsruhe";
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
 
@@ -64,5 +64,5 @@
 namespace utility {
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
 static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
@@ -75,10 +75,10 @@
 	: BootstrapModule(_callback), scan_timer_(io_service_) {
 	srand( time(NULL) );
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 	// This can be ignored, as the channel we really be saved in one
 	// of the info strings (as an attribute)
 	channel_ = 1;
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
@@ -95,5 +95,5 @@
 
 bool BluetoothSdp::isFunctional() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 	return true;
 #else
@@ -103,5 +103,5 @@
 
 void BluetoothSdp::start() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 	/*
@@ -112,9 +112,9 @@
 	t_ = boost::thread(boost::bind(&boost::asio::io_service::run, &io_service_));
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::stop() {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 	/*
@@ -129,10 +129,10 @@
 		sdp_close(sdp_session_);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::publishService(string name, string info1, string info2,
 		string info3) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 	/*
@@ -244,17 +244,17 @@
 	sdp_list_free(profile_list, 0);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 }
 
 void BluetoothSdp::revokeService(string name) {
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 
 	logging_debug("unregistering SDP service");
 	sdp_close(sdp_session_);
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
-}
-
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
+}
+
+#ifdef HAVE_LIBBLUETOOTH
 
 void BluetoothSdp::bt_scan() {
@@ -461,5 +461,5 @@
 }
 
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
 }} //namespace ariba, utility
Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 10688)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.h	(revision 10700)
@@ -54,5 +54,5 @@
 #include "ariba/utility/logging/Logging.h"
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
   #include <bluetooth/bluetooth.h>
   #include <bluetooth/sdp.h>
@@ -94,5 +94,5 @@
 private:
 
-#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
+#ifdef HAVE_LIBBLUETOOTH
 	void bt_scan();
 	void sdp_search(bdaddr_t target, string devicename);
@@ -104,5 +104,5 @@
 
 	bool haveConnections();
-#endif // HAVE_BLUETOOTH_BLUETOOTH_H
+#endif // HAVE_LIBBLUETOOTH
 
 	boost::asio::io_service io_service_;
Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt	(revision 10700)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/CMakeLists.txt	(revision 10700)
@@ -0,0 +1,41 @@
+# [License]
+# The Ariba-Underlay Copyright
+#
+# Copyright (c) 2008-2012, Institute of Telematics, UniversitÀt Karlsruhe (TH)
+#
+# Institute of Telematics
+# UniversitÀt Karlsruhe (TH)
+# Zirkel 2, 76128 Karlsruhe
+# Germany
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE OF TELEMATICS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OF TELEMATICS OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation
+# are those of the authors and should not be interpreted as representing
+# official policies, either expressed or implied, of the Institute of
+# Telematics.
+# [License]
+
+add_headers(BluetoothSdp.h)
+
+add_sources(BluetoothSdp.cpp)