From patchwork Mon Sep 14 22:54:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 517608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 74F94140D17 for ; Tue, 15 Sep 2015 08:54:55 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id BD4DC10934; Mon, 14 Sep 2015 15:54:35 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 193D910908 for ; Mon, 14 Sep 2015 15:54:34 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 2BEAB1E03A4 for ; Mon, 14 Sep 2015 16:54:31 -0600 (MDT) X-ASG-Debug-ID: 1442271270-03dc537d0f99720001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id grOm0WdAEC79dWH1 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 14 Sep 2015 16:54:30 -0600 (MDT) X-Barracuda-Envelope-From: azhou@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f48.google.com) (209.85.220.48) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 14 Sep 2015 22:54:30 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.48 Received: by pacex6 with SMTP id ex6so156343210pac.0 for ; Mon, 14 Sep 2015 15:54:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iqikckq2NPvwxMeXDQ22sRNUZrf5cNZsRxAn6IsdYGs=; b=YI5KL8xJfaEOWol4yv/Y5v6AK/DCrhABl614zGeOC5tJru+DoLUy++Aa2xpmMulUPv 0UV5D8xIYfqhFJJ63K+82ALFTXqiT0LU/DEcHLHg36DvDAlvL1h75WrMfs82I/jLb4xN S7883xPFETWW4aLbv0PJ/KDAf7dMW84eAxHS0dv8drZ5F8ClgG/iPjE3nLcL8OKo8thT v4SUEuFjQTwpNHlz4Nge2wHdUM1GK8E07aSfuforV6pFJbANw7M7xsRw2KVjrNoj94RQ RYjlLSfeBYgp5yEjHEt3jM8SYcgpjpqK3DahyfdNmzSGF2aWGGeAzl4+ohoB22HSDQKp KzPA== X-Gm-Message-State: ALoCoQnCin/nhtO1GqHxIG0saKFFiclam2kUfYIEwtJeRYPx4DsaAAKMWxzDTw6chfhD4h1PVQ6n X-Received: by 10.68.179.133 with SMTP id dg5mr40213677pbc.0.1442271269402; Mon, 14 Sep 2015 15:54:29 -0700 (PDT) Received: from ubuntu.localdomain ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id ox2sm18121426pbb.87.2015.09.14.15.54.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Sep 2015 15:54:28 -0700 (PDT) X-CudaMail-Envelope-Sender: azhou@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.1.34 From: Andy Zhou To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-913096542 X-CudaMail-DTE: 091415 X-CudaMail-Originating-IP: 209.85.220.48 Date: Mon, 14 Sep 2015 15:54:06 -0700 X-ASG-Orig-Subj: [##CM-E1-913096542##][v3 02/10] configure: add configuration options for libcap-ng Message-Id: <1442271254-27897-3-git-send-email-azhou@nicira.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442271254-27897-1-git-send-email-azhou@nicira.com> References: <1442271254-27897-1-git-send-email-azhou@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442271270 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [v3 02/10] configure: add configuration options for libcap-ng X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 --- 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(