From patchwork Thu Mar 24 13:13:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 601568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qW6MH4KjZz9rxv for ; Fri, 25 Mar 2016 00:13:47 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 177B4108E0; Thu, 24 Mar 2016 06:13:40 -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 79A5C108DE for ; Thu, 24 Mar 2016 06:13:38 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id DE0891E00CE for ; Thu, 24 Mar 2016 07:13:37 -0600 (MDT) X-ASG-Debug-ID: 1458825216-09eadd79ed1a1f80001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar5.cudamail.com with ESMTP id yg3fKBsSq6kuAoZq (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 24 Mar 2016 07:13:37 -0600 (MDT) X-Barracuda-Envelope-From: mchandras@suse.de X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mx2.suse.de) (195.135.220.15) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 24 Mar 2016 13:13:36 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at suse.de designates 195.135.220.15 as permitted sender) X-Barracuda-Apparent-Source-IP: 195.135.220.15 X-Barracuda-RBL-IP: 195.135.220.15 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A601DADCA for ; Thu, 24 Mar 2016 13:13:33 +0000 (UTC) X-CudaMail-Envelope-Sender: mchandras@suse.de From: Markos Chandras To: dev@openvswitch.org X-CudaMail-MID: CM-V3-323011019 X-CudaMail-DTE: 032416 X-CudaMail-Originating-IP: 195.135.220.15 Date: Thu, 24 Mar 2016 13:13:18 +0000 X-ASG-Orig-Subj: [##CM-V3-323011019##][PATCH 1/2] acinclude.m4: Allow building against a DPDK installation Message-Id: <1458825199-2595-2-git-send-email-mchandras@suse.de> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1458825199-2595-1-git-send-email-mchandras@suse.de> References: <1458825199-2595-1-git-send-email-mchandras@suse.de> X-GBUdb-Analysis: 0, 195.135.220.15, Ugly c=0 p=0 Source New X-MessageSniffer-Rules: 0-0-0-3826-c X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1458825217 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.28119 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: Markos Chandras Subject: [ovs-dev] [PATCH 1/2] acinclude.m4: Allow building against a DPDK installation 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" It's possible for a system to not have the compiled DPDK sources around but it might have DPDK installed so use that instead if possible. Signed-off-by: Markos Chandras --- acinclude.m4 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f345c31..0e6517b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -161,19 +161,24 @@ dnl Configure DPDK source tree AC_DEFUN([OVS_CHECK_DPDK], [ AC_ARG_WITH([dpdk], [AC_HELP_STRING([--with-dpdk=/path/to/dpdk], - [Specify the DPDK build directory])]) + [Specify the DPDK build or install directory])]) if test X"$with_dpdk" != X; then RTE_SDK=$with_dpdk DPDK_INCLUDE=$RTE_SDK/include + # Maybe RTE_SDK points to an installed DPDK? + # DPDK installs headers in $DESTDIR/$prefix/include/dpdk + if test ! -e $DPDK_INCLUDE/rte_config.h; then + DPDK_INCLUDE=$DPDK_INCLUDE/dpdk + fi DPDK_LIB_DIR=$RTE_SDK/lib DPDK_LIB="-ldpdk" DPDK_EXTRA_LIB="" - RTE_SDK_FULL=`readlink -f $RTE_SDK` + DPDK_INCLUDE_FULL=`readlink -f $DPDK_INCLUDE` AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <$RTE_SDK_FULL/include/rte_config.h> + [AC_LANG_PROGRAM([#include <$DPDK_INCLUDE_FULL/rte_config.h> #if !RTE_LIBRTE_VHOST_USER #error #endif], [])],