From 1d15d4e8d38ce891a0bf7d601fcd69ceaa5c3adc Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Wed, 9 Feb 2022 14:32:10 -0800
Subject: [PATCH] Add ZT_DEBUG to DEFS when specified

---
 make-linux.mk | 15 ++++++++-------
 make-mac.mk   |  4 ++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index 03c5824ba..eaec7432c 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -45,17 +45,14 @@ endif
 # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
 ONE_OBJS+=ext/http-parser/http_parser.o
 
-ifeq ($(ZT_DEBUG_TRACE),1)
-	DEFS+=-DZT_DEBUG_TRACE
-endif
-ifeq ($(ZT_TRACE),1)
-	DEFS+=-DZT_TRACE
-endif
-
 ifeq ($(ZT_RULES_ENGINE_DEBUGGING),1)
 	override DEFS+=-DZT_RULES_ENGINE_DEBUGGING
 endif
 
+ifeq ($(ZT_DEBUG_TRACE),1)
+	DEFS+=-DZT_DEBUG_TRACE
+endif
+
 # Build with address sanitization library for advanced debugging (clang)
 ifeq ($(ZT_SANITIZE),1)
 	override DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
@@ -98,6 +95,10 @@ ifeq ($(ZT_TRACE),1)
 	override DEFS+=-DZT_TRACE
 endif
 
+ifeq ($(ZT_DEBUG),1)
+	override DEFS+=-DZT_DEBUG
+endif
+
 ifeq ($(ZT_USE_TEST_TAP),1)
 	override DEFS+=-DZT_USE_TEST_TAP
 endif
diff --git a/make-mac.mk b/make-mac.mk
index 45db20b56..7c14fa67e 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -92,6 +92,10 @@ ifeq ($(ZT_TRACE),1)
 	DEFS+=-DZT_TRACE
 endif
 
+ifeq ($(ZT_DEBUG),1)
+	DEFS+=-DZT_DEBUG
+endif
+
 ifeq ($(ZT_VAULT_SUPPORT),1)
 	DEFS+=-DZT_VAULT_SUPPORT=1
 	LIBS+=-lcurl