[ovs-dev,V3,2/3] acinclude: Include libverbs and libmlx4 when needed

Message ID 20190207065230.31962-3-elibr@mellanox.com
State Superseded
Delegated to: Ian Stokes
Headers show
Series
  • Include libverbs and libmlx4/5 when needed
Related show

Commit Message

Eli Britstein Feb. 7, 2019, 6:52 a.m.
DPDK 18.11 uses libverbs and libmlx4 when MLX4 PMD is enabled.

This commit makes OVS to link to libverbs and libmlx4 when MLX4 PMD is
enabled on DPDK.

Signed-off-by: Eli Britstein <elibr@mellanox.com>
Reviewed-by: Asaf Penso <asafp@mellanox.com>
---
 acinclude.m4 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Patch

diff --git a/acinclude.m4 b/acinclude.m4
index e47ae8b91..ec0c235cc 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -312,12 +312,27 @@  AC_DEFUN([OVS_CHECK_DPDK], [
       [AC_SEARCH_LIBS([mlx5dv_create_wq],[mlx5],[],[AC_MSG_ERROR([unable to find libmlx5, install the dependency package])])
        DPDK_EXTRA_LIB="-lmlx5"])
 
+    AC_COMPILE_IFELSE([
+      AC_LANG_PROGRAM(
+        [
+          #include <rte_config.h>
+#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS)
+#error
+#endif
+        ], [])
+      ], [],
+      [AC_SEARCH_LIBS([mlx4dv_init_obj],[mlx4],[],[AC_MSG_ERROR([unable to find libmlx4, install the dependency package])])
+       DPDK_EXTRA_LIB="-lmlx4"])
+
     AC_COMPILE_IFELSE([
       AC_LANG_PROGRAM(
         [
           #include <rte_config.h>
 #if defined(RTE_LIBRTE_MLX5_PMD) && !defined(RTE_LIBRTE_MLX5_DLOPEN_DEPS)
 #error
+#endif
+#if defined(RTE_LIBRTE_MLX4_PMD) && !defined(RTE_LIBRTE_MLX4_DLOPEN_DEPS)
+#error
 #endif
         ], [])
       ], [],