Attachment 44873 Details for Bug 69340 – file.diff

[patch] file.diff

file.diff (text/plain), 1.82 KB, created by Guido Falsi on 2004-07-20 13:00:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2004-07-20 13:00:22 UTC

Size: 1.82 KB

patch

obsolete

>diff -ruN openobex.old/Makefile openobex/Makefile
>--- openobex.old/Makefile	Sat Jul 17 19:52:16 2004
>+++ openobex/Makefile	Sat Jul 17 19:52:47 2004
>@@ -14,8 +14,8 @@
> MAINTAINER=	mad@madpilot.net
> COMMENT=	Open source implementation of the OBEX protocol
> 
>-WANT_AUTOCONF_VER=	253
>-WANT_AUTOMAKE_VER=	14
>+USE_AUTOCONF_VER=	253
>+USE_AUTOMAKE_VER=	14
> WANT_LIBTOOL_VER=	15
> USE_GMAKE=		yes
> INSTALLS_SHLIB=		yes
>diff -ruN openobex.old/files/patch-aclocal.m4 openobex/files/patch-aclocal.m4
>--- openobex.old/files/patch-aclocal.m4	Sat Jul 17 19:52:16 2004
>+++ openobex/files/patch-aclocal.m4	Sat Jul 17 19:52:47 2004
>@@ -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)

Actions: View | Diff

Attachments on bug 69340: 44873