[Libreoffice-commits] .: configure.in solenv/gbuild

[Libreoffice Gerrit user]

 configure.in                  |   20 ++++++++++----------
 solenv/gbuild/gbuild.help.txt |   16 +++++++++-------
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit d53400c0b9f9205ebdabdf31df05d660aee59520
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 7 09:32:19 2012 +0200

    Clarify --enable-symbols misnomer
    
    Change-Id: Id3c206219385d6ab4673d1c8f6236a6cb665512a

diff --git a/configure.in b/configure.in
index 5291f0f..c5a9357 100644
--- a/configure.in
+++ b/configure.in
@@ -745,9 +745,9 @@ AC_ARG_ENABLE(atl,
 
 AC_ARG_ENABLE(symbols,
     AS_HELP_STRING([--enable-symbols],
-        [Include debugging symbols in output. WARNING - a complete build needs
-         a lot of space (roughly 10 GiB) and takes much longer (enables -g
-         compiler flag for GCC or equivalent).]),
+        [Include debugging information in output ("symbols" is misleading here;
+         enables -g compiler option or equivalent).  WARNING: A complete build
+         needs a lot of space (roughly 10 GiB) and takes much longer.]),
 ,)
 
 AC_ARG_ENABLE(werror,
@@ -758,13 +758,13 @@ AC_ARG_ENABLE(werror,
 
 AC_ARG_ENABLE(debug,
     AS_HELP_STRING([--enable-debug],
-        [Include debugging symbols like with --enable-symbols, disable compiler
-         optimization and inlining plus extra debugging code like assertions.
-         Extra large build! (enables -g compiler flag and dmake debug=true)
-         If you need even more verbose output, build a module with
+        [Include debugging information like with --enable-symbols, disable
+         compiler optimization and inlining plus extra debugging code like
+         assertions. Extra large build! (enables -g compiler flag and dmake
+         debug=true) If you need even more verbose output, build a module with
          "build -- debug=true dbglevel=2".
          You can also use this switch as follows:
-         --enable-debug="all -sw/ -Library_sc" to enable symbols only for
+         --enable-debug="all -sw/ -Library_sc" to enable debugging only for
          the specified gbuild-build targets (all means everything, - prepended
          means not to enable, / appended means everything in the directory,
          there is no ordering, more specific overrides more general, and
@@ -4041,9 +4041,9 @@ else
 fi
 AC_SUBST(ENABLE_LTO)
 
-dnl whether to include symbols into final build.
+dnl whether to include debgugging information into final build.
 dnl ===================================================================
-AC_MSG_CHECKING([whether to include symbols])
+AC_MSG_CHECKING([whether to include debugging information])
 if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
     ENABLE_SYMBOLS="TRUE"
     AC_MSG_RESULT([yes])
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 6802206..b658867 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -50,18 +50,20 @@ AVAILABLE TARGETS
 INTERACTIVE VARIABLES:
        DEBUG / debug   If not empty, build with DBGLEVEL=1 (see below).
        ENABLE_SYMBOLS / enable_symbols
-                       If not empty, build with debug symbols. Automatically
-                       enabled by DEBUG/debug.
+                       If not empty, build with debugging information.
+                       Automatically enabled by DEBUG/debug.
        DBGLEVEL / dbglevel
                        If not empty, force the debug level to the specified value. The
                        debug level is passed to the source code through OSL_DEBUG_LEVEL
                        macro.
                        0 = no debug
-                       1 = symbols + no optimizations
-                       2 = symbols + no optimizations + extra debug output. OSL_TRACE
-                           starts being active on this level.
-                       3... = symbols + no optimizations + extra debug output (usually
-                              extremely verbose). Levels > 2 are not used very much.
+                       1 = debugging information + no optimizations
+                       2 = degugging information + no optimizations + extra
+                           debug output. OSL_TRACE starts being active on this
+                           level.
+                       3... = degugging information + no optimizations + extra
+                              debug output (usually extremely verbose). Levels
+                              > 2 are not used very much.
 
        TIMELOG / timelog
                        If not empty enable the RTL_LOGFILE_* time logging facility.