From 939bad9adacbab5b62389d4668695147e915b630 Mon Sep 17 00:00:00 2001 From: Eli Britstein Date: Mon, 11 Feb 2019 13:32:33 +0200 Subject: [PATCH] acinclude: Include libverbs and libmlx5 when needed DPDK 18.11 uses libverbs and libmlx5 when MLX5 PMD is enabled. This commit makes OVS to link to libverbs and libmlx5 when MLX5 PMD is enabled on DPDK. Signed-off-by: Eli Britstein Reviewed-by: Shahaf Shuler Reviewed-by: Asaf Penso Acked-by: Flavio Leitner Acked-by: Ilya Maximets Signed-off-by: Ian Stokes --- acinclude.m4 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 6b28fd8c2..de3b04e39 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -301,6 +301,28 @@ AC_DEFUN([OVS_CHECK_DPDK], [ [AC_SEARCH_LIBS([mnl_attr_put],[mnl],[],[AC_MSG_ERROR([unable to find libmnl, install the dependency package])]) AC_DEFINE([DPDK_MNL], [1], [MLX5 PMD detected in DPDK.])]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [ + #include +#if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS) +#error +#endif + ], []) + ], [], + [AC_SEARCH_LIBS([mlx5dv_create_wq],[mlx5],[],[AC_MSG_ERROR([unable to find libmlx5, install the dependency package])])]) + + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [ + #include +#if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS) +#error +#endif + ], []) + ], [], + [AC_SEARCH_LIBS([verbs_init_cq],[ibverbs],[],[AC_MSG_ERROR([unable to find libibverbs, install the dependency package])])]) + # On some systems we have to add -ldl to link with dpdk # # This code, at first, tries to link without -ldl (""), -- 2.39.5