88f4450ab2
This patch allows the same set of rte_metrics_tel_* functions to be exported no matter JANSSON is available or not, by doing following: 1. Leverage dpdk_conf to set configuration flag RTE_HAS_JANSSON when Jansson dependency is found. 2. In rte_metrics_telemetry.c, leverage RTE_HAS_JANSSON to handle the case when JANSSON is not available by adding stubs for all the instances. 3. In meson.build, per dpdk/doc/guides/rel_notes/release_20_05.rst, it is claimed that "Telemetry library is no longer dependent on the external Jansson library, which allows Telemetry be enabled by default.", thus make the deps and includes of Telemetry as not conditional anymore. Signed-off-by: Jie Zhou <jizh@microsoft.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
14 lines
387 B
Meson
14 lines
387 B
Meson
# SPDX-License-Identifier: BSD-3-Clause
|
|
# Copyright(c) 2017 Intel Corporation
|
|
|
|
sources = files('rte_metrics.c', 'rte_metrics_telemetry.c')
|
|
headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
|
|
|
|
jansson = dependency('jansson', required: false, method: 'pkg-config')
|
|
if jansson.found()
|
|
dpdk_conf.set('RTE_HAS_JANSSON', 1)
|
|
ext_deps += jansson
|
|
endif
|
|
|
|
deps += ['ethdev', 'telemetry']
|