From: Daniel Wagner <dwagner@suse.de>
Date: Mon, 8 Nov 2021 09:42:02 +0000 (+0100)
Subject: build: Use CONFIG_JSONC consistently
X-Git-Tag: v2.0-rc0~55^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a6ef9946d2ffad1fb446dfac2aeff8d45df13ac6;p=users%2Fsagi%2Fnvme-cli.git

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 45e02b96..4da13d55 100644
--- 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 44e5402b..41dd71f1 100644
--- 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)