Add configuration option for enabling or disabling linking with
libcap-ng. This option is enabled by default. Disabling this option
prevents ovs-vswitchd from accepting the --user option on Linux.
Signed-off-by: Andy Zhou <az...@nicira.com>
---
configure.ac | 1 +
m4/openvswitch.m4 | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/configure.ac b/configure.ac
index 36387a1..39055fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,7 @@ OVS_CHECK_COVERAGE
OVS_CHECK_NDEBUG
OVS_CHECK_NETLINK
OVS_CHECK_OPENSSL
+OVS_CHECK_LIBCAPNG
OVS_CHECK_LOGDIR
OVS_CHECK_PYTHON
OVS_CHECK_DOT
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index 087c7e5..83edb16 100644
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -157,6 +157,29 @@ AC_DEFUN([OVS_CHECK_NETLINK],
[Define to 1 if Netlink protocol is available.])
fi])
+dnl Checks for libcap-ng.
+AC_DEFUN([OVS_CHECK_LIBCAPNG],
+ [AC_ARG_ENABLE(
+ [libcapng],
+ [AC_HELP_STRING([--disable-libcapng], [Disable Linux capability
support])],
+ [case "${enableval}" in
+ (yes) libcapng=true ;;
+ (no) libcapng=false ;;
+ (*) AC_MSG_ERROR([bad value ${enableval} for --enable-libcapng]) ;;
+ esac],
+ [libcapng=check])
+
+ if test "$libcapng" != false; then
+ AC_CHECK_LIB(cap-ng, capng_clear, HAVE_LIBCAPNG=yes)
+ fi
+
+ AM_CONDITIONAL([HAVE_LIBCAPNG], [test "$HAVE_LIBCAPNG" = yes])
+ if test "$HAVE_LIBCAPNG" = yes; then
+ AC_DEFINE([HAVE_LIBCAPNG], [1],
+ [Define to 1 if libcap-ng is available.])
+ OVS_LDFLAGS="$OVS_LDFLAGS -lcap-ng"
+ fi])
+
dnl Checks for OpenSSL.
AC_DEFUN([OVS_CHECK_OPENSSL],
[AC_ARG_ENABLE(
--
1.9.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
