build: Use CONFIG_JSONC consistently

The config flag for json-c hasn't been updated to the consistent
naming scheme everywhere. Let's use prefix it with CONFIG and use the
correct library name which is json-c.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/Makefile b/Makefile
index 45e02b963a28e1795d2d063387add108bd09212d..4da13d55b9d13db2a659eedfb1fa8a919a27643f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ endif
 ifeq ($(LIBJSONC), 0)
        override LDFLAGS += $(shell pkg-config --libs json-c)
        override CFLAGS += $(shell pkg-config --cflags json-c)
-       override CFLAGS += -DCONFIG_LIBJSONC
+       override CFLAGS += -DCONFIG_JSONC
 endif
 
 ifneq ("$(wildcard $(LIBNVMEDIR)/Makefile)","")

diff --git a/nvme.h b/nvme.h
index 44e5402b0f0dc2c7143871073da7434968d024db..41dd71f1d1815d6daddc64814bf3cbe9dd0523b2 100644 (file)
--- a/nvme.h
+++ b/nvme.h
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 
 #include "plugin.h"
-#ifdef CONFIG_LIBJSONC
+#ifdef CONFIG_JSONC
 #include <json.h>
 
 #define json_create_object(o) json_object_new_object(o)