diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-05-28 09:42:27 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-05-28 09:42:27 +0000 |
| commit | e8aa99e72a83914fcba73d4afdb906aa3bda42d9 (patch) | |
| tree | 41b4f2af13652e8eda664aaa3f4e73f7dd0b1f85 /config_office/configure.in | |
| parent | a0058371654eac3053bac5a2a84ba7ee129a3e88 (diff) | |
INTEGRATION: CWS cmcfixes45 (1.266.4); FILE MERGED
2008/05/13 07:47:15 cmc 1.266.4.1: #i89368# recheck jdk if we're using ecj
Diffstat (limited to 'config_office/configure.in')
| -rw-r--r-- | config_office/configure.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 45c79bbd20b2..9736865f5c42 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: 2008-05-20 14:34:05 $ +dnl * Date: $Date: 2008-05-28 10:42:27 $ 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.268 $ ) +AC_REVISION( $Revision: 1.269 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -2695,6 +2695,13 @@ if test "$SOLAR_JAVA" != ""; then JAVACOMPILER="${JAVACOMPILER}.exe" fi fi + + if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then + AC_MSG_CHECKING([re-checking JDK]) + JDK=gcj + AC_MSG_RESULT([checked (ecj)]) + _gij_longver="40200" + fi fi JAVACISGCJ="" |