config_host.mk.in | 1 +
configure.ac | 9 +++++++++
solenv/gbuild/gbuild.mk | 6 ++++++
3 files changed, 16 insertions(+)
New commits:
commit 061ced74ec8b71504464b1c74e0cf043ad158f2a
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Oct 23 12:58:56 2014 +0300
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri Aug 31 03:37:20 2018 +0200
Add --enable-sal-log
This is:
- Add --enable-sal-info
- Rename --enable-sal-info to --enable-sal-log
Change-Id: I896c9ac1c941b85d052fbefb902c4341664881d4
diff --git a/config_host.mk.in b/config_host.mk.in
index 5bc7b1455721..f1df8e336af4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,6 +157,7 @@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
export ENABLE_RANDR=@ENABLE_RANDR@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
+export ENABLE_SAL_LOG=@ENABLE_SAL_LOG@
export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
diff --git a/configure.ac b/configure.ac
index 4fe00e79aef1..895e50151f35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,6 +902,10 @@ AC_ARG_ENABLE(debug,
[Include debugging information, disable compiler optimization and
inlining plus
extra debugging code like assertions. Extra large build! (enables -g
compiler flag).]))
+AC_ARG_ENABLE(sal-log,
+ AS_HELP_STRING([--enable-sal-log],
+ [Make SAL_INFO and SAL_WARN calls do something even in a non-debug
build.]))
+
AC_ARG_ENABLE(selective-debuginfo,
AS_HELP_STRING([--enable-selective-debuginfo],
[If --enable-debug or --enable-dbgutil is used, build debugging
information
@@ -3792,6 +3796,11 @@ else
fi
AC_SUBST(ENABLE_DEBUG)
+if test "$enable_sal_log" = yes; then
+ ENABLE_SAL_LOG=TRUE
+fi
+AC_SUBST(ENABLE_SAL_LOG)
+
dnl Selective debuginfo
ENABLE_DEBUGINFO_FOR=
if test -n "$ENABLE_DEBUG"; then
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0796f8ba2541..93eda58ea3ac 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -232,6 +232,12 @@ gb_GLOBALDEFS += -DNDEBUG \
endif
+ifeq ($(ENABLE_SAL_LOG),TRUE)
+gb_GLOBALDEFS += -DSAL_LOG_INFO \
+ -DSAL_LOG_WARN \
+
+endif
+
else
gb_GLOBALDEFS += -DSAL_LOG_INFO \
-DSAL_LOG_WARN \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
