From 2f00ece21d4d51b553fd905b9a2e8eed12adf195 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 19 Jun 2020 15:33:04 +0200
Subject: Make --enable-sal-log orthogonal to --enable-debug

...for consistency with other options like --enable-assert-always-abort

Change-Id: I3734485e03203aaee065e1435dfd33f980b1b5eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96736
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 solenv/gbuild/gbuild.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'solenv/gbuild')

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9b..64ca8184e2fa 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -235,18 +235,13 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
-ifeq ($(gb_DEBUGLEVEL),0)
-
 ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 				 -DSAL_LOG_WARN \
 
 endif
 
-else
-gb_GLOBALDEFS += -DSAL_LOG_INFO \
-				 -DSAL_LOG_WARN \
-
+ifneq ($(gb_DEBUGLEVEL),0)
 ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
 gb_GLOBALDEFS += -DDEBUG \
 
-- 
cgit