summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac9
-rw-r--r--solenv/gbuild/gbuild.mk6
3 files changed, 16 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index e55b3f57b117..4de9201926fa 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,7 @@ export ENABLE_RANDR=@ENABLE_RANDR@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
export ENABLE_RUNTIME_OPTIMIZATIONS=@ENABLE_RUNTIME_OPTIMIZATIONS@
+export ENABLE_SAL_INFO=@ENABLE_SAL_INFO@
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 950784790e18..a72e4a8a9290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,6 +1015,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-info,
+ AS_HELP_STRING([--enable-sal-info],
+ [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
@@ -3801,6 +3805,11 @@ AC_SUBST(ENABLE_DEBUG)
AC_SUBST(ANDROID_DEBUGGABLE)
AC_SUBST(ANDROID_INSTALL_LOCATION)
+if test "$enable_sal_info" = yes; then
+ ENABLE_SAL_INFO=TRUE
+fi
+AC_SUBST(ENABLE_SAL_INFO)
+
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 294c7d18df4b..5c02a1959b77 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -239,6 +239,12 @@ gb_GLOBALDEFS += -DNDEBUG \
endif
+ifeq ($(ENABLE_SAL_INFO),TRUE)
+gb_GLOBALDEFS += -DSAL_LOG_INFO \
+ -DSAL_LOG_WARN \
+
+endif
+
else
gb_GLOBALDEFS += -DSAL_LOG_INFO \
-DSAL_LOG_WARN \