[ovs-dev,1/2] bugfix: Fix DPDK linking when using a relative path
diff mbox

Message ID 1442420173-1183-1-git-send-email-ciara.loftus@intel.com
State Accepted
Headers show

Commit Message

Ciara Loftus Sept. 16, 2015, 4:16 p.m. UTC
When linking with DPDK, if a relative path is used with the
'--with-dpdk' flag, then OVS will always be compiled with vHost Cuse
support, even if it is not enabled in the DPDK build.
This patch fixes this problem, and enables the correct version of
vHost despite whether or not a relative or absolute path is used.

Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
---
 acinclude.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Ben Pfaff Sept. 16, 2015, 5:19 p.m. UTC | #1
On Wed, Sep 16, 2015 at 05:16:12PM +0100, Ciara Loftus wrote:
> When linking with DPDK, if a relative path is used with the
> '--with-dpdk' flag, then OVS will always be compiled with vHost Cuse
> support, even if it is not enabled in the DPDK build.
> This patch fixes this problem, and enables the correct version of
> vHost despite whether or not a relative or absolute path is used.
> 
> Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>

Thanks, applied.

Patch
diff mbox

diff --git a/acinclude.m4 b/acinclude.m4
index b755dc4..47d9318 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -174,9 +174,10 @@  AC_DEFUN([OVS_CHECK_DPDK], [
     DPDK_LIB_DIR=$RTE_SDK/lib
     DPDK_LIB="-ldpdk"
     DPDK_EXTRA_LIB=""
+    RTE_SDK_FULL=`readlink -f $RTE_SDK`
 
     AC_COMPILE_IFELSE(
-      [AC_LANG_PROGRAM([#include <$RTE_SDK/include/rte_config.h>
+      [AC_LANG_PROGRAM([#include <$RTE_SDK_FULL/include/rte_config.h>
 #if !RTE_LIBRTE_VHOST_USER
 #error
 #endif], [])],