diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-19 15:33:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-19 17:02:55 +0200 |
| commit | 2f00ece21d4d51b553fd905b9a2e8eed12adf195 (patch) | |
| tree | d8bd5d698de26bdb099f892e68564119d89a63a3 | |
| parent | a60dd9ef1361c5925803acaa5292e99277d1faf3 (diff) | |
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>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 553402e33515..ccc9c07b21cd 100644 --- a/configure.ac +++ b/configure.ac @@ -4146,6 +4146,9 @@ printf ("hello world\n"); fi AC_SUBST(ENABLE_GDB_INDEX) +if test -z "$enable_sal_log" && test "$ENABLE_DEBUG" = TRUE; then + enable_sal_log=yes +fi if test "$enable_sal_log" = yes; then ENABLE_SAL_LOG=TRUE fi 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 \ |