diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2004-07-22 15:29:22 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2004-07-22 15:29:22 +0000 |
| commit | d67edcb1dfcf39ab9204a1e8e3b2145135066986 (patch) | |
| tree | 36789b42919115577863167a2e36a7e30797fd46 /comms/openobex | |
| parent | Mark the 2.2.x series of Samba as vulnerable. (diff) | |
Fix detection of the bluetooth stack
This is still untested on any architecture other than i386, so any
testing is encouraged!
PR: ports/69340
Submitted by: Guido Falsi (maintainer)
Notes
Notes:
svn path=/head/; revision=114440
Diffstat (limited to 'comms/openobex')
| -rw-r--r-- | comms/openobex/Makefile | 2 | ||||
| -rw-r--r-- | comms/openobex/files/patch-aclocal.m4 | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile index 9a7786c92efe..c2185ce391d1 100644 --- a/comms/openobex/Makefile +++ b/comms/openobex/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= mad@madpilot.net COMMENT= Open source implementation of the OBEX protocol -WANT_AUTOCONF_VER= 253 +USE_AUTOCONF_VER= 253 WANT_AUTOMAKE_VER= 14 WANT_LIBTOOL_VER= 15 USE_GMAKE= yes diff --git a/comms/openobex/files/patch-aclocal.m4 b/comms/openobex/files/patch-aclocal.m4 index 594e05c9896a..b184bc0ec824 100644 --- a/comms/openobex/files/patch-aclocal.m4 +++ b/comms/openobex/files/patch-aclocal.m4 @@ -1,6 +1,6 @@ ---- aclocal.m4.orig Mon Mar 22 16:19:39 2004 -+++ aclocal.m4 Mon Mar 22 16:22:51 2004 -@@ -67,6 +67,35 @@ +--- aclocal.m4.orig Wed Jun 16 19:59:04 2004 ++++ aclocal.m4 Wed Jun 16 20:26:17 2004 +@@ -67,6 +67,36 @@ BLUETOOTH_HOOK([],failure) ]) @@ -9,7 +9,8 @@ +AC_DEFUN([FREEBSD_BLUETOOTH_HOOK],[ + AC_MSG_CHECKING([for the FreeBSD/netgraph bluetooth support]) + echo -+ AC_CACHE_CHECK(for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>, ac_cv_have_sockaddr_rfcomm, ++ AC_CHECK_LIB(bluetooth, bt_aton, ++ [AC_CACHE_CHECK(for the struct sockaddr_rfcomm in <netgraph/.../ng_btsocket.h>, ac_cv_have_sockaddr_rfcomm, + [AC_TRY_COMPILE([#include <sys/types.h> + #include <sys/socket.h> + #include <bitstring.h> @@ -24,10 +25,10 @@ + AC_DEFINE(HAVE_BLUETOOTH) + AC_DEFINE(HAVE_BLUETOOTH_NETGRAPH,1,[Compile on FreeBSD]) + USE_BLUETOOTH="yes" -+ AC_CHECK_LIB(bluetooth, bt_aton, -+ [LIBS="$LIBS -lbluetooth" AC_DEFINE(HAVE_BT_ATON,1,[Define to 1 if you have the \`bt_aton' function.])]) ++ LIBS="$LIBS -lbluetooth" ++ AC_DEFINE(HAVE_BT_ATON,1,[Define to 1 if you have the \`bt_aton' function.]) + fi -+]) ++])]) + +AC_DEFUN([FREEBSD_BLUETOOTH_CHECK], [ + FREEBSD_BLUETOOTH_HOOK([],failure) |