[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 2 commits - config_host.mk.in configure.ac solenv/gbuild

[Tor Lillqvist]

 config_host.mk.in       |    1 +
 configure.ac            |    9 +++++++++
 solenv/gbuild/gbuild.mk |    6 ++++++
 3 files changed, 16 insertions(+)

New commits:
commit 2e9ede54b67e0d701ea72e41a75782236aff529b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 23 13:16:19 2014 +0300

    Rename --enable-sal-info to --enable-sal-log
    
    Change-Id: I896c9ac1c941b85d052fbefb902c4341664881d4

diff --git a/config_host.mk.in b/config_host.mk.in
index 155dc86..e822a90 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -166,7 +166,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_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 58b74a1..c8e7e13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,8 +1014,8 @@ 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],
+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,
@@ -3801,10 +3801,10 @@ AC_SUBST(ENABLE_DEBUG)
 AC_SUBST(ANDROID_DEBUGGABLE)
 AC_SUBST(ANDROID_INSTALL_LOCATION)
 
-if test "$enable_sal_info" = yes; then
-    ENABLE_SAL_INFO=TRUE
+if test "$enable_sal_log" = yes; then
+    ENABLE_SAL_LOG=TRUE
 fi
-AC_SUBST(ENABLE_SAL_INFO)
+AC_SUBST(ENABLE_SAL_LOG)
 
 dnl Selective debuginfo
 ENABLE_DEBUGINFO_FOR=
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 00b762c..3f27691 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -239,7 +239,7 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
-ifeq ($(ENABLE_SAL_INFO),TRUE)
+ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 				 -DSAL_LOG_WARN \
 
commit 38bdd2ed98201b717a0d56e7d1225a7c991baf3c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 23 12:58:56 2014 +0300

    Add --enable-sal-info
    
    Change-Id: I014d70ace7ce34b804ea2a018d3de8f94f7e0cbc

diff --git a/config_host.mk.in b/config_host.mk.in
index 605bb6b..155dc86 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -166,6 +166,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 91cc7d0..58b74a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,6 +1014,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
@@ -3797,6 +3801,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 52539ae..00b762c 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 \