From: Daniel Wagner <dwagner@suse.de>
Date: Tue, 2 Nov 2021 12:32:47 +0000 (+0100)
Subject: build: Prefix configuration switches
X-Git-Tag: v2.0-rc0~56^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5ced03a4e66df94f02536153a52440a6fae8f62a;p=users%2Fsagi%2Fnvme-cli.git

build: Prefix configuration switches

Although we decided to depend hard on json-c and libuuid, we still are
able to build and link without those libraries. Let's keep this
working for a little while longer before we pull the plug.

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

diff --git a/Makefile b/Makefile
index 4a8e7c0b..45e02b96 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ override CFLAGS += -I$(CCANDIR)
 
 ifeq ($(LIBUUID),0)
 	override LDFLAGS += -luuid
-	override CFLAGS += -DLIBUUID
+	override CFLAGS += -DCONFIG_LIBUUID
 	override LIB_DEPENDS += uuid
 endif
 
@@ -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 += -DLIBJSONC
+	override CFLAGS += -DCONFIG_LIBJSONC
 endif
 
 ifneq ("$(wildcard $(LIBNVMEDIR)/Makefile)","")
diff --git a/meson.build b/meson.build
index 52982673..d1f1437e 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,7 @@ libnvme_dep = dependency('libnvme', fallback : ['libnvme', 'libnvme_dep'])
 
 # Check for libuuid availability
 libuuid = dependency('uuid', required: true)
-conf.set('LIBUUID', libuuid.found(), description: 'Is libuuid required?')
+conf.set('CONFIG_LIBUUID', libuuid.found(), description: 'Is libuuid required?')
 
 # Check for libjson-c availability
 json_c = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c'])
diff --git a/nvme-print.c b/nvme-print.c
index 4c552a02..9d9e99d7 100644
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -2614,7 +2614,7 @@ static const char *nvme_uuid_to_string(uuid_t uuid)
 {
 	/* large enough to hold uuid str (37) + null-termination byte */
 	static char uuid_str[40];
-#ifdef LIBUUID
+#ifdef CONFIG_LIBUUID
 	uuid_unparse_lower(uuid, uuid_str);
 #else
 	static const char *hex_digits = "0123456789abcdef";
@@ -3485,7 +3485,7 @@ static void json_nvme_id_ns_descs(void *data)
 		__u8 eui64[NVME_NIDT_EUI64_LEN];
 		__u8 nguid[NVME_NIDT_NGUID_LEN];
 
-#ifdef LIBUUID
+#ifdef CONFIG_LIBUUID
 		uuid_t uuid;
 #endif
 		__u8 csi;
@@ -3526,7 +3526,7 @@ static void json_nvme_id_ns_descs(void *data)
 			nidt_name = "nguid";
 			break;
 
-#ifdef LIBUUID
+#ifdef CONFIG_LIBUUID
 		case NVME_NIDT_UUID:
 			memcpy(desc.uuid, data + off, sizeof(desc.uuid));
 			uuid_unparse_lower(desc.uuid, json_str);
@@ -3579,7 +3579,7 @@ void nvme_show_id_ns_descs(void *data, unsigned nsid, enum nvme_print_flags flag
 {
 	int pos, len = 0;
 	int i;
-#ifdef LIBUUID
+#ifdef CONFIG_LIBUUID
 	uuid_t uuid;
 	char uuid_str[37];
 #endif
@@ -3616,7 +3616,7 @@ void nvme_show_id_ns_descs(void *data, unsigned nsid, enum nvme_print_flags flag
 			printf("\n");
 			len = sizeof(nguid);
 			break;
-#ifdef LIBUUID
+#ifdef CONFIG_LIBUUID
 		case NVME_NIDT_UUID:
 			memcpy(uuid, data + pos + sizeof(*cur), 16);
 			uuid_unparse_lower(uuid, uuid_str);
diff --git a/nvme.h b/nvme.h
index de39e5fd..44e5402b 100644
--- a/nvme.h
+++ b/nvme.h
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 
 #include "plugin.h"
-#ifdef LIBJSONC
+#ifdef CONFIG_LIBJSONC
 #include <json.h>
 
 #define json_create_object(o) json_object_new_object(o)