Skip to content

Commit f1cd66c

Browse files
json: Enables json printing and ocp plugin without fabrics
Enables non fabrics-specific json functionality like printing and the ocp plugin when json-c is available, even if fabrics is disabled. Only nvme/json.c functionality is excluded when fabrics is disabled. Signed-off-by: Broc Going <[email protected]>
1 parent 48969fd commit f1cd66c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

libnvme/src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ else
7979
sources += 'nvme/no-uring.c'
8080
endif
8181

82-
if json_c_dep.found()
82+
if json_c_dep.found() and want_fabrics
8383
sources += 'nvme/json.c'
8484
else
8585
sources += 'nvme/no-json.c'

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ want_nvme = get_option('nvme').disabled() == false
5454
want_libnvme = get_option('libnvme').disabled() == false
5555
want_fabrics = get_option('fabrics').disabled() == false and host_system != 'windows'
5656
want_mi = get_option('mi').disabled() == false and host_system != 'windows'
57-
want_json_c = get_option('json-c').disabled() == false and want_fabrics
57+
want_json_c = get_option('json-c').disabled() == false
5858
want_libkmod = get_option('libkmod').disabled() == false and host_system != 'windows'
5959
want_tests = get_option('tests') and host_system != 'windows'
6060
want_examples = get_option('examples') and host_system != 'windows'

0 commit comments

Comments
 (0)