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

[Tor Lillqvist]

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

New commits:
commit c7cacf639d873e33cd98c56a0006d877b132341e
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 4de9201..395274d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,7 +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_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 a72e4a8..07eb557 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1015,8 +1015,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,
@@ -3805,10 +3805,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 5c02a19..3145540 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 \