From 1d3715db11f573060cb02a2b7b7c44f06607d337 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 3 Apr 2004 06:04:35 +0000
Subject: Update BlueZ library configuration

---
 tools/Makefile.am | 4 ++++
 tools/ciptool.c   | 4 ++++
 tools/hciattach.c | 4 ++++
 tools/hciconfig.c | 4 ++++
 tools/hcitool.c   | 4 ++++
 tools/sdptool.c   | 6 +++++-
 6 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ca7369a2..354f841c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,6 +8,10 @@ bin_PROGRAMS = hcitool l2ping sdptool ciptool
 
 hciconfig_SOURCES = hciconfig.c csr.h csr.c
 
+LDFLAGS = @BLUEZ_LIBS@
+
+INCLUDES = @BLUEZ_INCLUDES@
+
 man_MANS = hciattach.8 hciconfig.8 hcitool.1 l2ping.1 sdptool.1 ciptool.1
 
 noinst_PROGRAMS	= ppporc
diff --git a/tools/ciptool.c b/tools/ciptool.c
index d9aa0085..bec3fc2b 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -21,6 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/tools/hciattach.c b/tools/hciattach.c
index 799e338d..926e3fab 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
@@ -24,6 +24,10 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tools/hciconfig.c b/tools/hciconfig.c
index 39804e45..6ab7f190 100644
--- a/tools/hciconfig.c
+++ b/tools/hciconfig.c
@@ -25,6 +25,10 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tools/hcitool.c b/tools/hcitool.c
index 8fd7b83d..667212fe 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -25,6 +25,10 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/tools/sdptool.c b/tools/sdptool.c
index abb8b439..87646cab 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -28,14 +28,18 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
 #include <errno.h>
+#include <netinet/in.h>
 
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
-#include <bluetooth/sdp_internal.h>
 
 #define for_each_opt(opt, long, short) while ((opt=getopt_long(argc, argv, short ? short:"+", long, 0)) != -1)
 
-- 
cgit