From d1d1d3e99218807365ca141955fc2a85bc6ab0e1 Mon Sep 17 00:00:00 2001 From: Daniele Di Proietto Date: Thu, 25 Jun 2015 07:46:55 -0700 Subject: [PATCH] acinclude: Require libfuse only for DPDK with vhost-cuse. DPDK with vhost-user doesn't require libfuse, so we shouldn't link OVS with libfuse unless DPDK is built with vhost-cuse support. CC: Rapelly, Varun Signed-off-by: Daniele Di Proietto Acked-by: Pravin B Shelar --- acinclude.m4 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 20391eca6..14907abf0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -173,7 +173,11 @@ AC_DEFUN([OVS_CHECK_DPDK], [ DPDK_INCLUDE=$RTE_SDK/include DPDK_LIB_DIR=$RTE_SDK/lib DPDK_LIB="-lintel_dpdk" - DPDK_EXTRA_LIB="-lfuse" + DPDK_EXTRA_LIB="" + + OVS_GREP_IFELSE([$RTE_SDK/include/rte_config.h], [define RTE_LIBRTE_VHOST_USER 1], + [], [AC_DEFINE([VHOST_CUSE], [1], [DPDK vhost-cuse support enabled, vhost-user disabled.]) + DPDK_EXTRA_LIB="-lfuse"]) ovs_save_CFLAGS="$CFLAGS" ovs_save_LDFLAGS="$LDFLAGS" @@ -221,8 +225,6 @@ AC_DEFUN([OVS_CHECK_DPDK], [ AC_SUBST([DPDK_vswitchd_LDFLAGS]) AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.]) - OVS_GREP_IFELSE([$RTE_SDK/include/rte_config.h], [define RTE_LIBRTE_VHOST_USER 1], - [], [AC_DEFINE([VHOST_CUSE], [1], [DPDK vhost-cuse support enabled, vhost-user disabled.])]) else RTE_SDK= fi -- 2.20.1