--- config_office/configure.in	2006-11-05 00:08:40.000000000 +0200
+++ config_office/configure.in	2006-12-01 23:17:24.000000000 +0200
@@ -2053,6 +2053,7 @@
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
    JAVA_HOME=; export JAVA_HOME
+   if test "$JDK" != "gcj"; then
    if test -z "$with_jdk_home"; then
       AC_PATH_PROG(JAVAINTERPRETER, $WITH_JAVA)
    else
@@ -2242,6 +2243,9 @@
         JAVADOC=`cygpath -d "$JAVADOC"`
         JAVADOC=`cygpath -u "$JAVADOC"`
     fi
+   else
+        AC_PATH_PROG(JAVADOC, gjdoc)
+   fi
 fi
 
 if test "$SOLAR_JAVA" != ""; then
@@ -2283,6 +2287,8 @@
       CFLAGS="$CFLAGS -I$JAVA_HOME/include"
       LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
       exec 6>/dev/null # no output
+      JAVACMD="$JAVA_HOME/bin/gij"
+      AC_SUBST(JAVACMD)
       AC_CHECK_HEADER(jni.h, [],
                     [AC_MSG_ERROR([jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?])], [])
       AC_CHECK_LIB(gcjawt, JAWT_GetAWT, [ AWTLIB="-lgcjawt -lgcj"] )
@@ -4912,7 +4918,7 @@
 EOF
   oldJAVA_HOME=$JAVA_HOME
   if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
+    JAVACMD="$JAVA_HOME/bin/gij"; export JAVACMD
     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
--- config_office/set_soenv.in	2006-11-05 00:08:40.000000000 +0200
+++ config_office/set_soenv.in	2006-12-01 23:18:54.000000000 +0200
@@ -68,7 +68,7 @@
 #
 # Help variables.
 my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
-     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
+     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, $JAVACMD,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $SHELL_PATH, $XLIB, $XINC,
      $CYGWIN_PATH, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
      $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
@@ -1711,6 +1711,7 @@
    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
    ToFile( "JAVAAOTCOMPILER", "@JAVAAOTCOMPILER@","e" );
    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
+   ToFile( "JAVACMD",         "@JAVACMD@",       "e" );
 }
 if ( $platform =~ m/darwin/ )
 {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );