diff options
| author | Daniele Di Proietto <diproiettod@vmware.com> | 2015-06-25 07:46:55 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@nicira.com> | 2015-07-16 13:34:18 -0700 |
| commit | 10d01ad2150d3ccde548fdd5bf6b5a3551cdee6c (patch) | |
| tree | b9e4baaf82428dd2909d099a5d375a9842e846c4 /acinclude.m4 | |
| parent | 0fc1f5c04c8c1a9ac461da8c6ab88dee680a5ab3 (diff) | |
| download | openvswitch-10d01ad2150d3ccde548fdd5bf6b5a3551cdee6c.tar.gz | |
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 <vrapelly@sonusnet.com>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 8 |
1 files 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 |