Skip to content

C
core
Kaydet (Commit) cb80571f authored tarafından Herbert Dürr's avatar Herbert Dürr
Dosyalara gözat
Seçenekler

configure.in: update name to AOO

üst 7d91f9db
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 17 deletions
configure.in
Dosyayı görüntüle @ cb80571f
......@@ -3,12 +3,11 @@ dnl * vi:set sw=3 ts=3 et:
dnl *
dnl * Name: configure.in
dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
dnl * Date: $Date: 2008-09-08 07:38:40 $
dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
dnl * In this stage configure just checks the pre-requisites
dnl * necessary to build OpenOffice.org
dnl * necessary to build Apache OpenOffice
dnl *
dnl *
dnl ******************************************************************/
......@@ -96,13 +95,13 @@ AC_ARG_WITH(fonts,
],,)
AC_ARG_WITH(ppds,
[ --without-ppds Removes Postscript Printer definition files from
openoffice.org installation set, for people building
Apache Openoffice installation set, for people building
for specific distributions where PPDs are known to be
already available (every recent distro with CUPS
backend)
],,)
AC_ARG_WITH(afms,
[ --without-afms Removes bitmap font files from openoffice.org
[ --without-afms Removes bitmap font files from Apache Openoffice
installation set, for people building for specific
distributions where AFM files or TrueType Fonts
are known to be available.
......@@ -698,8 +697,8 @@ AC_ARG_WITH(nsis-path,
[ --with-nsis-path For Windows users, please supply the path to the
"Nullsoft Scriptable Install System" (NSIS). If NSIS
is found in the path or this option is supplied a self
contained executable installer for OpenOffice.org will
be created.
contained executable installer for Apache OpenOffice
will be created.
Usage: --with-nsis-path=<absolute path to nsis.exe>
],,)
......@@ -772,7 +771,7 @@ AC_ARG_ENABLE(ccache-skip,
identify as version 2.4_OOo
]],,enable_ccache_skip=auto)
AC_ARG_WITH(lang,
[ --with-lang Use this option to build OpenOffice.org with
[ --with-lang Use this option to build Apache OpenOffice with
additional language support. English (US) is always
included by default. Separate multiple languages with
space. For all languages, use --with-lang=ALL.
......@@ -788,7 +787,7 @@ AC_ARG_WITH(poor-help-localizations,
Usage: --with-poor-help-localizations="af ar be-BY ca"
],,)
AC_ARG_WITH(dict,
[ --with-dict Use this option to build OpenOffice.org with
[ --with-dict Use this option to build Apache OpenOffice with
dictionary support. ALL dictionaries are always
included by default unless overridden with
this option. Separate multiple dictionaries with
......@@ -899,17 +898,17 @@ dnl Message.
dnl ===================================================================
echo "********************************************************************"
echo "* *"
echo "* OpenOffice.org build configuration. *"
echo "* Apache OpenOffice build configuration. *"
echo "* *"
echo "* The configure process checks your platform to see whether *"
echo "* you can build OpenOffice.org on it. *"
echo "* you can build Apache OpenOffice on it. *"
echo "* This process checks all pre-requisites and generates a file *"
echo "* containing the necessary environment variables. *"
echo "* Source this file after configure has ended successfully. *"
echo "* *"
echo "* Any warning that is generated during the configure process *"
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 Apache OpenOffice. *"
echo "* *"
echo "********************************************************************"
echo ""
......@@ -1041,7 +1040,7 @@ case "$build_os" in
AC_MSG_CHECKING([the Solaris operating system release])
_os_release=`echo $build_os | $SED -e s/solaris2\.//`
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 Apache OpenOffice])
else
AC_MSG_RESULT([ok ($_os_release)])
fi
......@@ -1157,7 +1156,7 @@ case "$build_os" in
_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 Apache OpenOffice!])
;;
esac
......@@ -2333,7 +2332,7 @@ main (void)
test (E0);
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 Apache OpenOffice 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
......@@ -3065,7 +3064,7 @@ if test "$SOLAR_JAVA" != ""; then
# 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,
# AC_MSG_ERROR([In order to successfully build Apache OpenOffice using the BEA JDK,
#you must use the "--with-jdk-home" configure option explicitly])
# fi
#
......@@ -3088,7 +3087,7 @@ if test "$SOLAR_JAVA" != ""; then
AC_MSG_RESULT([checked (IBM JDK $_jdk)])
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 Apache OpenOffice using the IBM JDK,
you must use the "--with-jdk-home" configure option explicitly])
fi
......@@ -3584,7 +3583,7 @@ msi - Windows .msi
if test "$EPM" != "no" && test "$EPM" != "internal"; then
if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
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 Apache OpenOffice" $EPM >/dev/null 2>/dev/null; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
......
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