Index: config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.151
retrieving revision 1.142.4.8
diff -u -p -r1.151 -r1.142.4.8
--- config_office/configure	24 May 2006 16:00:11 -0000	1.151
+++ config_office/configure	6 Jul 2006 11:38:57 -0000	1.142.4.8
@@ -310,6 +310,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
+
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -7705,9 +7706,14 @@ echo "$as_me: error: $javacompiler not f
 fi
 
 if test "$SOLAR_JAVA" != ""; then
+    if test "$JDK" = "gcj"; then
+	javadoc_program=gjdoc
+    else
+	javadoc_program=javadoc
+    fi
     if test -z "$with_jdk_home"; then
-        # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
+        # Extract the first word of "$javadoc_program", so it can be a program name with args.
+set dummy $javadoc_program; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_JAVADOC+set}" = set; then
@@ -7746,12 +7752,12 @@ echo "${ECHO_T}no" >&6
 fi
 
     else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
+        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
                 if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
         else
-            # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
+            # Extract the first word of "$javadoc_program", so it can be a program name with args.
+set dummy $javadoc_program; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_JAVADOC+set}" = set; then
@@ -8200,6 +8206,59 @@ echo "$as_me: WARNING: $javacache not fo
    fi
 fi
 
+if test "$JDK" = "gcj"; then
+   if test -x "$JAVA_HOME/bin/fastjar"; then
+      JAR="$JAVA_HOME/bin/fastjar";
+   else
+      if test -x "$JAVA_HOME/bin/jar"; then
+         JAR="$JAVA_HOME/bin/jar";
+      else
+         # Extract the first word of "jar", so it can be a program name with args.
+set dummy jar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $JAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+JAR=$ac_cv_path_JAR
+
+if test -n "$JAR"; then
+  echo "$as_me:$LINENO: result: $JAR" >&5
+echo "${ECHO_T}$JAR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+      fi
+   fi
+JAVACMD=$JAVAINTERPRETER
+
+
+fi
+
 
 
 
@@ -21134,9 +21193,8 @@ cat > conftest.xml << EOF
 	</target>
     </project>
 EOF
-  oldJAVA_HOME=$JAVA_HOME
   if test "$JDK" = "gcj"; then
-    JAVA_HOME=; export JAVA_HOME
+    export JAVACMD
     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
@@ -21163,9 +21221,9 @@ echo "$as_me: WARNING: Ant does not work
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
-  JAVA_HOME=$oldJAVA_HOME
   rm -f conftest* core core.* *.core
 fi
+
 if test -z "$ANT_HOME"; then
    ANT_HOME="NO_ANT_HOME"
 fi
@@ -21982,6 +22040,8 @@ s,@JAVACOMPILER@,$JAVACOMPILER,;t t
 s,@JAVADOC@,$JAVADOC,;t t
 s,@AWTLIB@,$AWTLIB,;t t
 s,@JAVACACHE@,$JAVACACHE,;t t
+s,@JAR@,$JAR,;t t
+s,@JAVACMD@,$JAVACMD,;t t
 s,@JAVA_HOME@,$JAVA_HOME,;t t
 s,@JDK@,$JDK,;t t
 s,@XSLTPROC@,$XSLTPROC,;t t
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.166
retrieving revision 1.159.4.7
diff -u -p -r1.166 -r1.159.4.7
--- config_office/configure.in	24 May 2006 12:03:52 -0000	1.166
+++ config_office/configure.in	6 Jul 2006 11:39:11 -0000	1.159.4.7
@@ -2141,15 +2141,20 @@ dnl ====================================
 dnl Checks for javadoc
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
+    if test "$JDK" = "gcj"; then
+	javadoc_program=gjdoc
+    else
+	javadoc_program=javadoc
+    fi
     if test -z "$with_jdk_home"; then
-        AC_PATH_PROG(JAVADOC, javadoc)
+        AC_PATH_PROG(JAVADOC, $javadoc_program)
     else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
+        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
         dnl Check if there is a javadoc at all.
         if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
         else
-            AC_PATH_PROG(JAVADOC, javadoc)
+            AC_PATH_PROG(JAVADOC, $javadoc_program)
         fi
     fi
     if test -z "$JAVADOC"; then
@@ -2239,6 +2244,24 @@ if test `$JAVACOMPILER --version 2>&1 | 
    fi
 fi
 
+dnl ===================================================================
+dnl Pass optional environment variable, use if compiler is gcj
+dnl ===================================================================
+if test "$JDK" = "gcj"; then
+   if test -x "$JAVA_HOME/bin/fastjar"; then
+      JAR="$JAVA_HOME/bin/fastjar";
+   else
+      if test -x "$JAVA_HOME/bin/jar"; then
+         JAR="$JAVA_HOME/bin/jar";
+      else
+         AC_PATH_PROG(JAR,jar)
+      fi
+   fi
+JAVACMD=$JAVAINTERPRETER
+AC_SUBST(JAVACMD)
+AC_SUBST(JAR)
+fi
+
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JDK)
 AC_SUBST(JAVAINTERPRETER)
@@ -4665,9 +4688,8 @@ cat > conftest.xml << EOF
 	</target>
     </project>
 EOF
-  oldJAVA_HOME=$JAVA_HOME
   if test "$JDK" = "gcj"; then
-    JAVA_HOME=; export JAVA_HOME
+    export JAVACMD
     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
@@ -4688,9 +4710,9 @@ EOF
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
-  JAVA_HOME=$oldJAVA_HOME
   rm -f conftest* core core.* *.core
 fi
+
 if test -z "$ANT_HOME"; then
    ANT_HOME="NO_ANT_HOME"
 fi
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.105
retrieving revision 1.92.4.4
diff -u -p -r1.105 -r1.92.4.4
--- config_office/set_soenv.in	2 Jun 2006 12:34:16 -0000	1.105
+++ config_office/set_soenv.in	6 Jul 2006 11:39:30 -0000	1.92.4.4
@@ -1638,6 +1638,8 @@ if ( '@JDK@' ne '' )
    ToFile( "JAVAINTERPRETER", "@JAVAINTERPRETER@","e" );
    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
+   ToFile( "JAVACMD",         "@JAVACMD@",       "e" );
+   ToFile( "JAR",             "@JAR@",           "e" );
 }
 if ( $platform =~ m/darwin/ )
 {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
Index: berkeleydb/makefile.mk
===================================================================
RCS file: /cvs/external/berkeleydb/makefile.mk,v
retrieving revision 1.31
retrieving revision 1.30.6.3
diff -u -p -r1.31 -r1.30.6.3
--- berkeleydb/makefile.mk	8 Mar 2006 14:13:53 -0000	1.31
+++ berkeleydb/makefile.mk	6 Jul 2006 11:39:43 -0000	1.30.6.3
@@ -87,6 +87,10 @@ CONFIGURE_ACTION= \
 CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
 .IF "$(SOLAR_JAVA)"!=""
 CONFIGURE_FLAGS+=--enable-java
+.IF "$(JDK)"=="gcj"
+JAVA:=$(JAVAINTERPRETER)
+.EXPORT : JAVA
+.ENDIF
 .ENDIF
 
 BUILD_DIR=$(CONFIGURE_DIR)
Index: qadevOOo/runner/makefile.mk
===================================================================
RCS file: /cvs/qa/qadevOOo/runner/makefile.mk,v
retrieving revision 1.11
retrieving revision 1.11.12.1
diff -u -p -r1.11 -r1.11.12.1
--- qadevOOo/runner/makefile.mk	2 Nov 2005 17:40:11 -0000	1.11
+++ qadevOOo/runner/makefile.mk	4 Mar 2006 04:49:22 -0000	1.11.12.1
@@ -54,13 +54,17 @@ OWNJAR: ALLTAR
 
 .INCLUDE :  target.mk
 
+.IF "$(JAR)"==""
+JAR=jar
+.ENDIF
+
 # LLA: parameter v is only verbose, need too long!
 OWNJAR: LIGHT
-    +jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+    +$(JAR) cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
 
 # LLA: parameter v is only verbose, need too long!
 LIGHT:
-    +jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+    +$(JAR) cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
 
 .ELSE
 all:
Index: config_office/configure
===================================================================
RCS file: /cvs/tools/config_office/configure,v
retrieving revision 1.154
retrieving revision 1.142.4.11
diff -u -p -r1.154 -r1.142.4.11
--- config_office/configure	10 Jul 2006 19:05:10 -0000	1.154
+++ config_office/configure	19 Jul 2006 14:21:19 -0000	1.142.4.11
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision .
+# From configure.in Revision: 1.169  .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAR JAVACMD JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -7782,9 +7782,14 @@ fi
 
 
 if test "$SOLAR_JAVA" != ""; then
+    if test "$JDK" = "gcj"; then
+	javadoc_program=gjdoc
+    else
+	javadoc_program=javadoc
+    fi
     if test -z "$with_jdk_home"; then
-        # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
+        # Extract the first word of "$javadoc_program", so it can be a program name with args.
+set dummy $javadoc_program; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_JAVADOC+set}" = set; then
@@ -7823,12 +7828,12 @@ echo "${ECHO_T}no" >&6
 fi
 
     else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
+        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
                 if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
         else
-            # Extract the first word of "javadoc", so it can be a program name with args.
-set dummy javadoc; ac_word=$2
+            # Extract the first word of "$javadoc_program", so it can be a program name with args.
+set dummy $javadoc_program; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_JAVADOC+set}" = set; then
@@ -8289,6 +8294,58 @@ echo "${ECHO_T}no" >&6
   fi
 fi
 
+if test "$JDK" = "gcj"; then
+   if test -x "$JAVA_HOME/bin/fastjar"; then
+      JAR="$JAVA_HOME/bin/fastjar";
+   else
+      if test -x "$JAVA_HOME/bin/jar"; then
+         JAR="$JAVA_HOME/bin/jar";
+      else
+         # Extract the first word of "jar", so it can be a program name with args.
+set dummy jar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $JAR in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+JAR=$ac_cv_path_JAR
+
+if test -n "$JAR"; then
+  echo "$as_me:$LINENO: result: $JAR" >&5
+echo "${ECHO_T}$JAR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+      fi
+   fi
+JAVACMD=$JAVAINTERPRETER
+
+
+fi
 
 
 
@@ -21223,9 +21280,8 @@ cat > conftest.xml << EOF
 	</target>
     </project>
 EOF
-  oldJAVA_HOME=$JAVA_HOME
   if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
+    JAVACMD="$JAVAINTERPRETER"; export JAVACMD
     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
@@ -21252,7 +21308,6 @@ echo "$as_me: WARNING: Ant does not work
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
-  JAVA_HOME=$oldJAVA_HOME
   rm -f conftest* core core.* *.core
 fi
 if test -z "$ANT_HOME"; then
@@ -22072,6 +22127,8 @@ s,@JAVACISGCJ@,$JAVACISGCJ,;t t
 s,@JAVADOC@,$JAVADOC,;t t
 s,@AWTLIB@,$AWTLIB,;t t
 s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t
+s,@JAR@,$JAR,;t t
+s,@JAVACMD@,$JAVACMD,;t t
 s,@JAVA_HOME@,$JAVA_HOME,;t t
 s,@JDK@,$JDK,;t t
 s,@XSLTPROC@,$XSLTPROC,;t t
Index: config_office/configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.169
retrieving revision 1.159.4.10
diff -u -p -r1.169 -r1.159.4.10
--- config_office/configure.in	10 Jul 2006 19:00:12 -0000	1.169
+++ config_office/configure.in	19 Jul 2006 14:21:22 -0000	1.159.4.10
@@ -2175,15 +2175,20 @@ dnl ====================================
 dnl Checks for javadoc
 dnl ===================================================================
 if test "$SOLAR_JAVA" != ""; then
+    if test "$JDK" = "gcj"; then
+	javadoc_program=gjdoc
+    else
+	javadoc_program=javadoc
+    fi
     if test -z "$with_jdk_home"; then
-        AC_PATH_PROG(JAVADOC, javadoc)
+        AC_PATH_PROG(JAVADOC, $javadoc_program)
     else
-        _javadoc_path="$with_jdk_home/bin/javadoc"
+        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
         dnl Check if there is a javadoc at all.
         if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
         else
-            AC_PATH_PROG(JAVADOC, javadoc)
+            AC_PATH_PROG(JAVADOC, $javadoc_program)
         fi
     fi
     if test -z "$JAVADOC"; then
@@ -2281,6 +2286,23 @@ if test "$SOLAR_JAVA" != ""; then
   fi
 fi
 
+dnl ===================================================================
+dnl Pass optional environment variable, use if compiler is gcj
+dnl ===================================================================
+if test "$JDK" = "gcj"; then
+   if test -x "$JAVA_HOME/bin/fastjar"; then
+      JAR="$JAVA_HOME/bin/fastjar";
+   else
+      if test -x "$JAVA_HOME/bin/jar"; then
+         JAR="$JAVA_HOME/bin/jar";
+      else
+         AC_PATH_PROG(JAR,jar)
+      fi
+   fi
+JAVACMD=$JAVAINTERPRETER
+AC_SUBST(JAVACMD)
+AC_SUBST(JAR)
+fi
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JDK)
 AC_SUBST(JAVAINTERPRETER)
@@ -4707,9 +4729,8 @@ cat > conftest.xml << EOF
 	</target>
     </project>
 EOF
-  oldJAVA_HOME=$JAVA_HOME
   if test "$JAVACISGCJ" = "yes"; then
-    JAVA_HOME=; export JAVA_HOME
+    JAVACMD="$JAVAINTERPRETER"; export JAVACMD
     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
   else
     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
@@ -4730,7 +4751,6 @@ EOF
     ANT_HOME=""
     echo "Ant does not work - Some Java projects will not build!" >>warn
   fi
-  JAVA_HOME=$oldJAVA_HOME
   rm -f conftest* core core.* *.core
 fi
 if test -z "$ANT_HOME"; then
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.107
retrieving revision 1.92.4.5
diff -u -p -r1.107 -r1.92.4.5
--- config_office/set_soenv.in	5 Jul 2006 22:32:39 -0000	1.107
+++ config_office/set_soenv.in	18 Jul 2006 14:30:19 -0000	1.92.4.5
@@ -1648,6 +1648,8 @@ if ( '@JDK@' ne '' )
    ToFile( "JAVACOMPILER",    "@JAVACOMPILER@",  "e" );
    ToFile( "JAVAAOTCOMPILER", "@JAVAAOTCOMPILER@","e" );
    ToFile( "JAVADOC",         "@JAVADOC@",       "e" );
+   ToFile( "JAVACMD",         "@JAVACMD@",       "e" );
+   ToFile( "JAR",             "@JAR@",           "e" );
 }
 if ( $platform =~ m/darwin/ )
 {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
Index: berkeleydb/makefile.mk
===================================================================
RCS file: /cvs/external/berkeleydb/makefile.mk,v
retrieving revision 1.32
retrieving revision 1.30.6.4
diff -u -p -r1.32 -r1.30.6.4
--- berkeleydb/makefile.mk	5 Jul 2006 21:52:16 -0000	1.32
+++ berkeleydb/makefile.mk	18 Jul 2006 14:30:32 -0000	1.30.6.4
@@ -89,6 +89,10 @@ CONFIGURE_ACTION= \
 CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
 .IF "$(SOLAR_JAVA)"!=""
 CONFIGURE_FLAGS+=--enable-java
+.IF "$(JDK)"=="gcj"
+JAVA:=$(JAVAINTERPRETER)
+.EXPORT : JAVA
+.ENDIF
 .ENDIF
 
 BUILD_DIR=$(CONFIGURE_DIR)
Index: qadevOOo/runner/makefile.mk
===================================================================
RCS file: /cvs/qa/qadevOOo/runner/makefile.mk,v
retrieving revision 1.11
retrieving revision 1.11.12.1
diff -u -p -r1.11 -r1.11.12.1
--- qadevOOo/runner/makefile.mk	2 Nov 2005 17:40:11 -0000	1.11
+++ qadevOOo/runner/makefile.mk	4 Mar 2006 04:49:22 -0000	1.11.12.1
@@ -54,13 +54,17 @@ OWNJAR: ALLTAR
 
 .INCLUDE :  target.mk
 
+.IF "$(JAR)"==""
+JAR=jar
+.ENDIF
+
 # LLA: parameter v is only verbose, need too long!
 OWNJAR: LIGHT
-    +jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+    +$(JAR) cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
 
 # LLA: parameter v is only verbose, need too long!
 LIGHT:
-    +jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+    +$(JAR) cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
 
 .ELSE
 all: