diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-10-23 12:58:56 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-10-23 13:02:28 +0300 |
commit | 6addde24f43d4d77cd459ef1d34df84cdad49d8f (patch) | |
tree | a032d80d8fce9343ccd161bf2701f834484949a7 | |
parent | 2593d96b8d03fd1d4f17b05882a09687c47471c5 (diff) |
Add --enable-sal-info
Change-Id: I014d70ace7ce34b804ea2a018d3de8f94f7e0cbc
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.mk | 6 |
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 \ |