[Libreoffice-commits] core.git: configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 configure.ac            |    9 ++++++++-
 solenv/gbuild/gbuild.mk |    4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 98ad9ec18ee63d6b97b4b90917113656450b81fd
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Aug 31 12:07:52 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 31 14:27:23 2018 +0200

    Make --enable-assert-always-abort orthogonal of --enable-debug/dbgutil
    
    (and keep enabled by default iff --enable-debug/dbgutil)
    
    Change-Id: I962230b4c6623220603cb713c787c69274f63a8f
    Reviewed-on: https://gerrit.libreoffice.org/59859
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configure.ac b/configure.ac
index f4f7303c0146..756261a4f052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4639,7 +4639,14 @@ AC_SUBST(ENABLE_WERROR)
 dnl Check for --enable-assert-always-abort, set ASSERT_ALWAYS_ABORT
 dnl ===================================================================
 AC_MSG_CHECKING([whether to have assert() failures abort even without --enable-debug])
-if test -n "$enable_assert_always_abort" -a "$enable_assert_always_abort" = "yes"; then
+if test -z "$enable_assert_always_abort"; then
+   if test "$ENABLE_DEBUG" = TRUE; then
+       enable_assert_always_abort=yes
+   else
+       enable_assert_always_abort=no
+   fi
+fi
+if test "$enable_assert_always_abort" = "yes"; then
     ASSERT_ALWAYS_ABORT="TRUE"
     AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a67780a2cef8..522183ed9ffc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -204,13 +204,13 @@ gb_GLOBALDEFS += -DTIMELOG \
 
 endif
 
-ifeq ($(gb_DEBUGLEVEL),0)
-
 ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE)
 gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
+ifeq ($(gb_DEBUGLEVEL),0)
+
 ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 				 -DSAL_LOG_WARN \