Changeset 179

Timestamp:

07/11/07 21:22:26 (17 months ago)

Author:

zany

Message:

freebsd bt fix

Location:

trunk

Files:

• acinclude.m4 (modified) (3 diffs)
• obexftp/client.c (modified) (2 diffs)

trunk/acinclude.m4

@@ -19 +19 @@
 AC_ARG_ENABLE([irda],
               [AC_HELP_STRING([--disable-irda],
-                              [Disables openftp irda support @<:@default=auto@:>@])],
+                              [Disables irda support @<:@default=auto@:>@])],
               [ac_irda_enabled=$enableval], [ac_irda_enabled=yes])
 
@@ -69 +69 @@
                         ], freebsdbt_found=yes, freebsdbt_found=no)
         ])
+        if test "${freebsdbt_found}" = "yes"; then
+                BLUETOOTH_LIBS=-lbluetooth
+        fi
 ])
 
@@ -97 +100 @@
 AC_ARG_ENABLE([bluetooth],
               [AC_HELP_STRING([--disable-bluetooth],
-                              [Disables openftp bluetooth support @<:@default=auto@:>@])],
+                              [Disables bluetooth support @<:@default=auto@:>@])],
               [ac_bluetooth_enabled=$enableval], [ac_bluetooth_enabled=yes])
 

trunk/obexftp/client.c

@@ -63 +63 @@
 #include <sys/types.h>
 #include <bluetooth.h>
+#define BDADDR_ANY      (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
+
 #else /* Linux */
 #include <bluetooth/bluetooth.h>
@@ -608 +610 @@
                         bacpy(&src_addr, BDADDR_ANY);
                 }
-#ifndef _WIN32
+#ifdef HAVE_SDPLIB
                 else if (!strncmp(src, "hci", 3)) {
                         hci_devba(atoi(src + 3), &src_addr);