diff --git a/config_office/configure b/config_office/configure
index 1cdcb419bc38..7cf759cb367e 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.173  .
+# From configure.in Revision .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -7900,7 +7900,9 @@ echo "$as_me: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some
         JDK=gcj
         echo "$as_me:$LINENO: result: checked (gcj)" >&5
 echo "${ECHO_T}checked (gcj)" >&6
-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
+        if test -z "$JAVA_HOME"; then
+            JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
+        fi
       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
         JDK=bea
 
@@ -8200,12 +8202,16 @@ echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with
     fi
 fi
 
-if test "$JDK" = "gcj"; then
-   save_CFLAGS=$CFLAGS
-   save_LDFLAGS=$LDFLAGS
-   CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-   LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
-   if test "${ac_cv_header_jni_h+set}" = set; then
+if test "$SOLAR_JAVA" != ""; then
+   echo "$as_me:$LINENO: checking for jawt lib name" >&5
+echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6
+   if test "$JDK" = "gcj"; then
+      save_CFLAGS=$CFLAGS
+      save_LDFLAGS=$LDFLAGS
+      CFLAGS="$CFLAGS -I$JAVA_HOME/include"
+      LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
+      exec 6>/dev/null # no output
+      if test "${ac_cv_header_jni_h+set}" = set; then
   echo "$as_me:$LINENO: checking for jni.h" >&5
 echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
 if test "${ac_cv_header_jni_h+set}" = set; then
@@ -8351,8 +8357,7 @@ echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj o
 fi
 
 
-
-   echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
+      echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5
 echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6
 if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8417,11 +8422,11 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5
 echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6
 if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then
-   AWTLIB=-lgcjawt
+   AWTLIB="-lgcjawt -lgcj"
 fi
 
-   if test -z "$AWTLIB"; then
-      echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
+      if test -z "$AWTLIB"; then
+          echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5
 echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6
 if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8486,19 +8491,20 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5
 echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6
 if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then
-   AWTLIB=-ljawt
+   AWTLIB="-ljawt -lgcj"
 fi
 
+      fi
+      exec 6>&1 # output on again
+      CFLAGS=$save_CFLAGS
+      LDFLAGS=$save_LDFLAGS
    fi
    if test -z "$AWTLIB"; then
-      { { echo "$as_me:$LINENO: error: either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj" >&5
-echo "$as_me: error: either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj" >&2;}
-   { (exit 1); exit 1; }; }
+      AWTLIB=-ljawt
    fi
+   echo "$as_me:$LINENO: result: $AWTLIB" >&5
+echo "${ECHO_T}$AWTLIB" >&6
 
-
-   CFLAGS=$save_CFLAGS
-   LDFLAGS=$save_LDFLAGS
 fi
 
 if test "$SOLAR_JAVA" != ""; then