summaryrefslogtreecommitdiff
path: root/config_office
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2007-04-25 13:58:10 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2007-04-25 13:58:10 +0000
commit74bca9433a28044bf24281851b4c6ed0e56bf87d (patch)
treeda97d2403633ac7ec04006feeef489f4946cb861 /config_office
parent1bbc142d5a59f5b0fb3c0cbcc750ea84a2825f72 (diff)
INTEGRATION: CWS sixtyfour11 (1.197.2); FILE MERGED
2007/02/27 15:38:06 kendy 1.197.2.1: #i74920# Error message in AC_MSG_ERROR should be one string.
Diffstat (limited to 'config_office')
-rw-r--r--config_office/configure.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/config_office/configure.in b/config_office/configure.in
index 631d38c44642..099efab15717 100644
--- a/config_office/configure.in
+++ b/config_office/configure.in
@@ -3,7 +3,7 @@ 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: 2007-04-16 14:18:38 $
+dnl * Date: $Date: 2007-04-25 14:58:10 $
dnl *
dnl * Desc: This file serves as input for the GNU autoconf package
dnl * in order to create a configure script.
@@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org
dnl *
dnl *
dnl ******************************************************************/
-AC_REVISION( $Revision: 1.199 $ )
+AC_REVISION( $Revision: 1.200 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@@ -2209,8 +2209,8 @@ 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([you must use the "--with-jdk-home" configure option explicitly])
+ 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])
@@ -2232,8 +2232,8 @@ 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([you must use the "--with-jdk-home" configure option explicitly])
+ AC_MSG_ERROR([In order to successfully build OpenOffice.org using the IBM JDK,
+you must use the "--with-jdk-home" configure option explicitly])
fi
if test "$_jdk_ver" -gt 10402; then
AC_MSG_WARN([IBM JDK might be too recent, maximum version tested is 1.4.2])