From 155017abdf24416f6d1d2ea58aa13423aa46bf19 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 29 Apr 2012 12:59:18 +0200
Subject: [PATCH] build: Remove dependency on libcap-ng

---
 Makefile.am         |  5 ++---
 bootstrap-configure |  3 +--
 configure.ac        | 10 ----------
 src/main.c          |  8 --------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d7b547e..8cf3dc6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,8 +83,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \
 			src/ippool.c src/bridge.c src/nat.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
-					@CAPNG_LIBS@ @XTABLES_LIBS@ \
-					@GNUTLS_LIBS@ -lresolv -ldl
+				@XTABLES_LIBS@ @GNUTLS_LIBS@ -lresolv -ldl
 
 src_connmand_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/connman.ver
@@ -111,7 +110,7 @@ build_plugindir = $(plugindir)
 build_scriptdir = $(scriptdir)
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @XTABLES_CFLAGS@ \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
 				@GNUTLS_CFLAGS@ $(builtin_cflags) \
 				-DCONNMAN_PLUGIN_BUILTIN \
 				-DSTATEDIR=\""$(statedir)"\" \
diff --git a/bootstrap-configure b/bootstrap-configure
index deb73bf..3202c00 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -19,5 +19,4 @@ fi
 		--enable-openconnect=builtin \
 		--enable-openvpn=builtin \
 		--enable-nmcompat \
-		--enable-polkit \
-		--enable-capng $*
+		--enable-polkit $*
diff --git a/configure.ac b/configure.ac
index f76f3d6..9e11721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,16 +324,6 @@ AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
 		[enable test/example scripts]), [enable_test=${enableval}])
 AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
 
-AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng],
-		[enable capabilities support]), [enable_capng=${enableval}])
-if (test "${enable_capng}" = "yes"); then
-	PKG_CHECK_MODULES(CAPNG, libcap-ng, dummy=yes,
-				AC_MSG_ERROR(Capabilities library is required))
-	AC_SUBST(CAPNG_CFLAGS)
-	AC_SUBST(CAPNG_LIBS)
-	AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
-fi
-
 AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat],
 				[enable Network Manager support]),
 			[enable_nmcompat=${enableval}], [enable_nmcompat="no"])
diff --git a/src/main.c b/src/main.c
index a28bd88..48a956c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,10 +37,6 @@
 
 #include <gdbus.h>
 
-#ifdef HAVE_CAPNG
-#include <cap-ng.h>
-#endif
-
 #include "connman.h"
 
 static struct {
@@ -387,10 +383,6 @@ int main(int argc, char *argv[])
 	GKeyFile *config;
 	guint signal;
 
-#ifdef HAVE_CAPNG
-	/* Drop capabilities */
-#endif
-
 #ifdef NEED_THREADS
 	if (g_thread_supported() == FALSE)
 		g_thread_init(NULL);
-- 
2.7.4