Kaydet (Commit) c3ab3df9 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Renamed OpenOffice.org into LibreOffice in configure scripts

üst f5c1fef0
...@@ -8,7 +8,7 @@ dnl * ...@@ -8,7 +8,7 @@ dnl *
dnl * Desc: This file serves as input for the GNU autoconf package dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script. dnl * in order to create a configure script.
dnl * In this stage configure just checks the pre-requisites dnl * In this stage configure just checks the pre-requisites
dnl * necessary to build OpenOffice.org dnl * necessary to build LibreOffice
dnl * dnl *
dnl * dnl *
dnl ******************************************************************/ dnl ******************************************************************/
...@@ -704,7 +704,7 @@ AC_ARG_WITH(nsis-path, ...@@ -704,7 +704,7 @@ AC_ARG_WITH(nsis-path,
[ --with-nsis-path For Windows users, please supply the path to the [ --with-nsis-path For Windows users, please supply the path to the
"Nullsoft Scriptable Install System" (NSIS). If NSIS "Nullsoft Scriptable Install System" (NSIS). If NSIS
is found in the path or this option is supplied a self is found in the path or this option is supplied a self
contained executable installer for OpenOffice.org will contained executable installer for LibreOffice will
be created. be created.
Usage: --with-nsis-path=<absolute path to nsis.exe> Usage: --with-nsis-path=<absolute path to nsis.exe>
...@@ -772,7 +772,7 @@ AC_ARG_ENABLE(ccache-skip, ...@@ -772,7 +772,7 @@ AC_ARG_ENABLE(ccache-skip,
identify as version 2.4_OOo identify as version 2.4_OOo
]],,enable_ccache_skip=auto) ]],,enable_ccache_skip=auto)
AC_ARG_WITH(lang, AC_ARG_WITH(lang,
[ --with-lang Use this option to build OpenOffice.org with [ --with-lang Use this option to build LibreOffice with
additional language support. English (US) is always additional language support. English (US) is always
included by default. Separate multiple languages with included by default. Separate multiple languages with
space. For all languages, use --with-lang=ALL. space. For all languages, use --with-lang=ALL.
...@@ -788,7 +788,7 @@ AC_ARG_WITH(poor-help-localizations, ...@@ -788,7 +788,7 @@ AC_ARG_WITH(poor-help-localizations,
Usage: --with-poor-help-localizations="af ar be-BY ca" Usage: --with-poor-help-localizations="af ar be-BY ca"
],,) ],,)
AC_ARG_WITH(dict, AC_ARG_WITH(dict,
[ --with-dict Use this option to build OpenOffice.org with [ --with-dict Use this option to build LibreOffice with
dictionary support. ALL dictionaries are always dictionary support. ALL dictionaries are always
included by default unless overridden with included by default unless overridden with
this option. Separate multiple dictionaries with this option. Separate multiple dictionaries with
...@@ -953,17 +953,17 @@ dnl Message. ...@@ -953,17 +953,17 @@ dnl Message.
dnl =================================================================== dnl ===================================================================
echo "********************************************************************" echo "********************************************************************"
echo "* *" echo "* *"
echo "* OpenOffice.org build configuration. *" echo "* LibreOffice build configuration. *"
echo "* *" echo "* *"
echo "* The configure process checks your platform to see whether *" echo "* The configure process checks your platform to see whether *"
echo "* you can build OpenOffice.org on it. *" echo "* you can build LibreOffice on it. *"
echo "* This process checks all pre-requisites and generates a file *" 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 "* Any warning that is 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 OpenOffice.org *" echo "* an unsuccessful build of LibreOffice. *"
echo "* *" echo "* *"
echo "********************************************************************" echo "********************************************************************"
echo "" echo ""
...@@ -1064,7 +1064,7 @@ case "$build_os" in ...@@ -1064,7 +1064,7 @@ case "$build_os" in
AC_MSG_CHECKING([the Solaris operating system release]) AC_MSG_CHECKING([the Solaris operating system release])
_os_release=`echo $build_os | $SED -e s/solaris2\.//` _os_release=`echo $build_os | $SED -e s/solaris2\.//`
if test "$_os_release" -lt "6"; then if test "$_os_release" -lt "6"; then
AC_MSG_ERROR([use solaris >= 6 to build OpenOffice.org]) AC_MSG_ERROR([use solaris >= 6 to build LibreOffice])
else else
AC_MSG_RESULT([ok ($_os_release)]) AC_MSG_RESULT([ok ($_os_release)])
fi fi
...@@ -1176,7 +1176,7 @@ case "$build_os" in ...@@ -1176,7 +1176,7 @@ case "$build_os" in
_os=AIX _os=AIX
;; ;;
*) *)
AC_MSG_ERROR([$_os operating system is not suitable to build OpenOffice.org!]) AC_MSG_ERROR([$_os operating system is not suitable to build LibreOffice!])
;; ;;
esac esac
...@@ -2245,7 +2245,7 @@ main (void) ...@@ -2245,7 +2245,7 @@ main (void)
test (E0); test (E0);
return 0; return 0;
} }
],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])]) ],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug which prevents LibreOffice from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details.])], [AC_MSG_RESULT([no])])
fi fi
fi fi
...@@ -2954,28 +2954,6 @@ if test "$SOLAR_JAVA" != ""; then ...@@ -2954,28 +2954,6 @@ if test "$SOLAR_JAVA" != ""; then
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in]) AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
# JDK=bea
#
# dnl BEA JDK specific tests
# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
#
# if test "$_jdk_ver" -lt 10500; then
# AC_MSG_ERROR([JDK is too old, you need at least BEA JDK 1.5.0])
# fi
#
# AC_MSG_RESULT([checked (BEA JDK $_jdk)])
#
# if test "$with_jdk_home" = ""; then
# AC_MSG_ERROR([In order to successfully build OpenOffice.org using the BEA JDK,
#you must use the "--with-jdk-home" configure option explicitly])
# fi
#
# AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
# echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
#
# JAVA_HOME=$with_jdk_home
#
elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
JDK=ibm JDK=ibm
...@@ -2990,7 +2968,7 @@ if test "$SOLAR_JAVA" != ""; then ...@@ -2990,7 +2968,7 @@ if test "$SOLAR_JAVA" != ""; then
AC_MSG_RESULT([checked (IBM JDK $_jdk)]) AC_MSG_RESULT([checked (IBM JDK $_jdk)])
if test "$with_jdk_home" = ""; then if test "$with_jdk_home" = ""; then
AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK, AC_MSG_ERROR([In order to successfully build LibreOffice using the IBM JDK,
you must use the "--with-jdk-home" configure option explicitly]) you must use the "--with-jdk-home" configure option explicitly])
fi fi
...@@ -3566,7 +3544,7 @@ msi - Windows .msi ...@@ -3566,7 +3544,7 @@ msi - Windows .msi
if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
AC_MSG_CHECKING([whether epm is patched for OOos needs]) AC_MSG_CHECKING([whether epm is patched for OOos needs])
if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
......
...@@ -155,7 +155,7 @@ $EPM_FLAGS = ""; ...@@ -155,7 +155,7 @@ $EPM_FLAGS = "";
# , $Warning. # , $Warning.
AddWarning( "configure", "" ); AddWarning( "configure", "" );
# #
print ("Setting up the environment for building OpenOffice.org $newline"); print ("Setting up the environment for building LibreOffice $newline");
# #
#-------------------------------------------------- #--------------------------------------------------
# V. Setting the environment variables/values. # V. Setting the environment variables/values.
...@@ -808,7 +808,7 @@ print "done\n"; ...@@ -808,7 +808,7 @@ print "done\n";
# D. Gathering directory information from the user. # D. Gathering directory information from the user.
# #
# If the directory does not exist something is strange. # If the directory does not exist something is strange.
# 1. OpenOffice.org build home directory. # 1. LibreOffice build home directory.
chomp($SRC_ROOT = `pwd`); chomp($SRC_ROOT = `pwd`);
$SRC_ROOT =~ s/\/config_office//; $SRC_ROOT =~ s/\/config_office//;
$SRC_ROOT = PathFormat($SRC_ROOT); $SRC_ROOT = PathFormat($SRC_ROOT);
...@@ -2108,12 +2108,12 @@ if (rename( $outfile_sh, $tmp ) ne 1) ...@@ -2108,12 +2108,12 @@ if (rename( $outfile_sh, $tmp ) ne 1)
print "$newline"; print "$newline";
print "*********************************************************". print "*********************************************************".
"******************* $newline"."*"."$newline"; "******************* $newline"."*"."$newline";
print "* OpenOffice.org $UPD configuration. $newline"; print "* LibreOffice $UPD configuration. $newline";
for ( $tmp = 0; $tmp < 2; $tmp++ ) for ( $tmp = 0; $tmp < 2; $tmp++ )
{ print "* $newline"; { print "* $newline";
} }
print "* Configuration part of OpenOffice.org $UPD build is finished. $newline* $newline"; print "* Configuration part of LibreOffice $UPD build is finished. $newline* $newline";
print "* NB! Be aware that you might not be able to build OpenOffice.org if you $newline". print "* NB! Be aware that you might not be able to build LibreOffice if you $newline".
"* ignore any warning message that were generated during this configuration $newline". "* ignore any warning message that were generated during this configuration $newline".
"* process. $newline* $newline"; "* process. $newline* $newline";
...@@ -2219,7 +2219,7 @@ sub CreateFileHeader ...@@ -2219,7 +2219,7 @@ sub CreateFileHeader
my $comment = $_[4]; my $comment = $_[4];
print { $filehandle } "$comment #################################################################"; print { $filehandle } "$comment #################################################################";
print { $filehandle } $newline; print { $filehandle } $newline;
print { $filehandle } "$comment OpenOffice.org $_[ 1 ] build environment file for: $_[ 2 ]. $newline"; print { $filehandle } "$comment LibreOffice $_[ 1 ] build environment file for: $_[ 2 ]. $newline";
print { $filehandle } "$comment Generated on: $timestamp $newline"; print { $filehandle } "$comment Generated on: $timestamp $newline";
print { $filehandle } "$comment Source this file to set up the build environment. $newline"; print { $filehandle } "$comment Source this file to set up the build environment. $newline";
print { $filehandle } "$comment 1. exec $_[3] $newline"; print { $filehandle } "$comment 1. exec $_[3] $newline";
......
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