Kaydet (Commit) 8208a542 authored tarafından Herbert Dürr's avatar Herbert Dürr

reformulate informational mentions of the word "warning" so that

it no longer matches the default pattern a buildbot watches out for

also fixed mis-spellings of the word "compatibility"
üst a6b23e53
...@@ -681,9 +681,9 @@ AC_ARG_WITH(stlport, ...@@ -681,9 +681,9 @@ AC_ARG_WITH(stlport,
Usage: --with-stlport=<absolute path to stlport home> Usage: --with-stlport=<absolute path to stlport home>
Warning!!, disabling using --without-stlport or Warning: disabling using --without-stlport or
enabling using --with-stlport on a platform that enabling using --with-stlport on a platform that
defaults to the opposite will break ABI compatability defaults to the opposite will break ABI compatibility
], WITH_STLPORT=$withval , WITH_STLPORT=auto) ], WITH_STLPORT=$withval , WITH_STLPORT=auto)
AC_ARG_WITH(jdk-home, AC_ARG_WITH(jdk-home,
[ --with-jdk-home if you have installed JDK 1.3 or later on your system [ --with-jdk-home if you have installed JDK 1.3 or later on your system
...@@ -1004,7 +1004,7 @@ echo "* This process checks all pre-requisites and generates a file *" ...@@ -1004,7 +1004,7 @@ echo "* This process checks all pre-requisites and generates a file *"
echo "* containing the necessary environment variables. *" echo "* containing the necessary environment variables. *"
echo "* Source this file after configure has ended successfully. *" echo "* Source this file after configure has ended successfully. *"
echo "* *" echo "* *"
echo "* Any warning that is generated during the configure process *" echo "* Warnings that are generated during the configure process *"
echo "* must be taken into account since it can be a reason for *" echo "* must be taken into account since it can be a reason for *"
echo "* an unsuccessful build of Apache OpenOffice. *" echo "* an unsuccessful build of Apache OpenOffice. *"
echo "* *" echo "* *"
...@@ -2774,15 +2774,15 @@ dnl =================================================================== ...@@ -2774,15 +2774,15 @@ dnl ===================================================================
if test "$WITH_STLPORT" = "yes"; then if test "$WITH_STLPORT" = "yes"; then
AC_MSG_RESULT([using internal stlport.]) AC_MSG_RESULT([using internal stlport.])
if test "$DEFAULT_TO_STLPORT" != "yes"; then if test "$DEFAULT_TO_STLPORT" != "yes"; then
AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!]) AC_MSG_WARN([using stlport. Warning, breaks your ABI compatibility!])
echo "using stlport. Warning, breaks your ABI compatability!" >>warn echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
fi fi
elif test "$WITH_STLPORT" = "no"; then elif test "$WITH_STLPORT" = "no"; then
AC_MSG_RESULT([using system STL]) AC_MSG_RESULT([using system STL])
USE_SYSTEM_STL="YES" USE_SYSTEM_STL="YES"
if test "$DEFAULT_TO_STLPORT" != "no"; then if test "$DEFAULT_TO_STLPORT" != "no"; then
AC_MSG_WARN([using system STL. Warning, breaks your ABI compatability!]) AC_MSG_WARN([using system STL. Warning, breaks your ABI compatibility!])
echo "using system STL. Warning, breaks your ABI compatability!" >>warn echo "using system STL. Warning: breaks your ABI compatibility!" >>warn
fi fi
else else
STLPORT4=$WITH_STLPORT STLPORT4=$WITH_STLPORT
...@@ -2828,8 +2828,8 @@ dnl =================================================================== ...@@ -2828,8 +2828,8 @@ dnl ===================================================================
fi fi
fi fi
if test "$DEFAULT_TO_STLPORT" != "yes"; then if test "$DEFAULT_TO_STLPORT" != "yes"; then
AC_MSG_WARN([using stlport. Warning, breaks your ABI compatability!]) AC_MSG_WARN([using stlport. Warning: breaks your ABI compatibility!])
echo "using stlport. Warning, breaks your ABI compatability!" >>warn echo "using stlport. Warning: breaks your ABI compatibility!" >>warn
fi fi
fi fi
......
...@@ -2204,8 +2204,8 @@ for ( $tmp = 0; $tmp < 2; $tmp++ ) ...@@ -2204,8 +2204,8 @@ for ( $tmp = 0; $tmp < 2; $tmp++ )
{ print "* $newline"; { print "* $newline";
} }
print "* Configuration part of Apache OpenOffice $UPD build is finished. $newline* $newline"; print "* Configuration part of Apache OpenOffice $UPD build is finished. $newline* $newline";
print "* NB! Be aware that you might not be able to build Apache OpenOffice if you $newline". print "* Note: Be aware that you might not be able to build Apache OpenOffice if $newline".
"* ignore any warning message that were generated during this configuration $newline". "* you ignore any warnings that were generated during this configuration $newline".
"* process. $newline* $newline"; "* process. $newline* $newline";
if ( $Warning ne "" ) if ( $Warning ne "" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment