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

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=""