net/mlx5: fix using flow tunnel before null check

[dpdk.git] / drivers / net / mlx4 / meson.build

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 4040065150f68212937649542fede193c156537e..d7602b748e130519834dd55f070d559549495dd9 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -10,8 +10,8 @@ endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
 dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
-LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION = '18.02.0'
+LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
+LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
        dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
@@ -24,7 +24,8 @@ endif
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-       lib = dependency('lib' + libname, static:static_ibverbs, required:false)
+       lib = dependency('lib' + libname, static:static_ibverbs,
+                       required:false, method: 'pkg-config')
        if not lib.found() and not static_ibverbs
                lib = cc.find_library(libname, required:false)
        endif