From 7082351401b76e6ae4638333a15a3b844ad87985 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 8 Nov 2013 16:31:56 +0100
Subject: disable libcap

---
 package/miredo/Makefile                   |  3 +++
 package/miredo/patches/patch-configure_ac | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 package/miredo/patches/patch-configure_ac

(limited to 'package')

diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index bdb33c2bc..87aecf3e4 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5bcdbaced54f40b6cb1e9c9a8dbac411
 PKG_DESCR:=		A Teredo client and relay daemon
 PKG_SECTION:=		ipv6
+PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://www.remlab.net/
 PKG_SITES:=		http://www.remlab.net/files/miredo/
 
@@ -21,9 +22,11 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
 TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_file__proc_self_maps=yes
 CONFIGURE_ARGS+=	--without-Judy \
+			--without-libcap \
 			--enable-teredo-client \
 			--enable-miredo-user=root
 
diff --git a/package/miredo/patches/patch-configure_ac b/package/miredo/patches/patch-configure_ac
new file mode 100644
index 000000000..f2e24d7b4
--- /dev/null
+++ b/package/miredo/patches/patch-configure_ac
@@ -0,0 +1,25 @@
+--- miredo-1.2.6.orig/configure.ac	2013-05-23 17:51:41.000000000 +0200
++++ miredo-1.2.6/configure.ac	2013-11-08 16:09:54.000000000 +0100
+@@ -149,12 +149,17 @@ LIBS="$LIBS_save"
+ AS_MESSAGE([checking optional features...])
+ 
+ # POSIX capabilities
++AC_ARG_WITH(libcap,
++	    [AS_HELP_STRING(--with-libcap,
++			    [use POSIX capabilities (default auto)])])
+ LIBCAP=""
+-AC_CHECK_HEADERS([sys/capability.h], [
+-	AC_CHECK_LIB(cap, cap_set_proc, [
+-		LIBCAP="-lcap"
+-		AC_DEFINE(HAVE_LIBCAP, 1,
+-			  [Define to 1 if you have the `cap' library (-lcap).])
++AS_IF([test "x${with_libcap}" != "xno"], [
++	AC_CHECK_HEADERS([sys/capability.h], [
++		AC_CHECK_LIB(cap, cap_set_proc, [
++			LIBCAP="-lcap"
++			AC_DEFINE(HAVE_LIBCAP, 1,
++				  [Define to 1 if you have the `cap' library (-lcap).])
++		])
+ 	])
+ ])
+ AC_SUBST(LIBCAP)
-- 
cgit v1.2.3