nbft: enable nbft-plugin.c build without json-c dependencies checking

Only build json print codes with CONFIG_JSONC build option instead.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/plugins/meson.build b/plugins/meson.build
index 53cef08f026a26c81eeada94e300aa1f95219a02..106a245cb8b46ae4fdaa9a7d0dfda0a64ac14fc2 100644 (file)
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -2,7 +2,6 @@
 
 if json_c_dep.found()
   sources += [
-    'plugins/nbft/nbft-plugin.c',
     'plugins/netapp/netapp-nvme.c',
     'plugins/nvidia/nvidia-nvme.c',
     'plugins/scaleflux/sfx-nvme.c',
@@ -27,6 +26,7 @@ sources += [
   'plugins/intel/intel-nvme.c',
   'plugins/memblaze/memblaze-nvme.c',
   'plugins/micron/micron-nvme.c',
+  'plugins/nbft/nbft-plugin.c',
   'plugins/shannon/shannon-nvme.c',
   'plugins/toshiba/toshiba-nvme.c',
   'plugins/transcend/transcend-nvme.c',

diff --git a/plugins/nbft/nbft-plugin.c b/plugins/nbft/nbft-plugin.c
index f25941a5dbc077bc55d8da38b109e85509bd59ac..01d92229e17016b31a5c271c6a9454ce55bd6957 100644 (file)
--- a/plugins/nbft/nbft-plugin.c
+++ b/plugins/nbft/nbft-plugin.c
@@ -47,6 +47,7 @@ static char *mac_addr_to_string(unsigned char mac_addr[6])
        return mac_string;
 }
 
+#ifdef CONFIG_JSONC
 static json_object *hfi_to_json(struct nbft_info_hfi *hfi)
 {
        struct json_object *hfi_json;
@@ -348,6 +349,9 @@ fail:
        json_free_object(nbft_json_array);
        return -ENOMEM;
 }
+#else /* CONFIG_JSONC */
+#define json_show_nbfts(nbft_list, show_subsys, show_hfi, show_discovery) -EINVAL
+#endif /* CONFIG_JSONC */
 
 static void print_nbft_hfi_info(struct nbft_info *nbft)
 {