mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

acinclude: Require libfuse only for DPDK with vhost-cuse.

Browse Source 
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 <vrapelly@sonusnet.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
This commit is contained in:
Daniele Di Proietto
2015-06-25 07:46:55 -07:00
committed by Pravin B Shelar
parent 0fc1f5c04c
commit 10d01ad215
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@@ -173,7 +173,11 @@ AC_DEFUN([OVS_CHECK_DPDK], [
DPDK_INCLUDE=$RTE_SDK/include DPDK_INCLUDE=$RTE_SDK/include
DPDK_LIB_DIR=$RTE_SDK/lib DPDK_LIB_DIR=$RTE_SDK/lib
DPDK_LIB="-lintel_dpdk" 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_CFLAGS="$CFLAGS"
ovs_save_LDFLAGS="$LDFLAGS" ovs_save_LDFLAGS="$LDFLAGS"
@@ -221,8 +225,6 @@ AC_DEFUN([OVS_CHECK_DPDK], [
AC_SUBST([DPDK_vswitchd_LDFLAGS]) AC_SUBST([DPDK_vswitchd_LDFLAGS])
AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.]) 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 else
RTE_SDK= RTE_SDK=
fi fi