Now buildable with java-gcj-compat. WITH_GNUGCJ uses it.

3 files changed, 8 insertions, 299 deletions

diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 0336c917026c..842f04140177 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -93,9 +93,10 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 
 .if defined(WITH_GNUGCJ)
 GCCVER=41
-BUILD_DEPENDS+=	${PREFIX}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc
-RUN_DEPENDS+=	${PREFIX}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj/bin/java:${PORTSDIR}/java/java-gcj-compat
+RUN_DEPENDS+=	${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt
+RUN_DEPEND+=	${LOCALBASE}/lib/jvm/java-gcj/bin/java:${PORTSDIR}/java/java-gcj-compat
 .else
 .if ${ARCH} == amd64
 GCCVER=41
@@ -149,14 +150,14 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 .if defined(WITH_GNUGCJ)
-CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
+CONFIGURE_ENV+=      PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}"
 .endif
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
-.if ${ARCH} == amd64
+.if ${ARCH} == amd64 || defined(WITH_GNUGCJ)
 WITHOUT_MOZILLA=	yes
 .endif
 .if (${GCCVER} == 41)
@@ -167,7 +168,7 @@ CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
+EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
 
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
@@ -198,13 +199,6 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-	@${RM} -Rf ${WRKDIR}/gnugcj
-	@${MKDIR} ${WRKDIR}/gnugcj/bin
-	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
-	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
-	@${LN} -s ${LOCALBASE}/bin/gcj-dbtool41 ${WRKDIR}/gnugcj/bin/gcj-dbtool
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index a81647fbd583..8e007114522f 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -5,7 +5,7 @@
 .if !defined(WITH_GNUGCJ)
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .else
-CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 
 .if defined(WITH_KDE)
diff --git a/editors/openoffice.org-3/files/cws-maho1.diff b/editors/openoffice.org-3/files/cws-maho1.diff
deleted file mode 100644
index 8362b1cdb171..000000000000
--- a/editors/openoffice.org-3/files/cws-maho1.diff
+++ /dev/null
@@ -1,285 +0,0 @@
-Index: config_office/configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.159
-retrieving revision 1.159.4.6
-diff -u -p -r1.159 -r1.159.4.6
---- config_office/configure.in	28 Feb 2006 16:41:29 -0000	1.159
-+++ config_office/configure.in	7 Mar 2006 02:51:41 -0000	1.159.4.6
-@@ -2023,15 +2023,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
-@@ -2121,6 +2126,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)
-@@ -4322,9 +4345,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"
-@@ -4345,9 +4367,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.92
-retrieving revision 1.92.4.3
-diff -u -p -r1.92 -r1.92.4.3
---- config_office/set_soenv.in	28 Feb 2006 10:41:43 -0000	1.92
-+++ config_office/set_soenv.in	4 Mar 2006 08:04:38 -0000	1.92.4.3
-@@ -1696,6 +1696,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.30
-retrieving revision 1.30.6.2
-diff -u -p -r1.30 -r1.30.6.2
---- berkeleydb/makefile.mk	13 Jan 2006 16:23:55 -0000	1.30
-+++ berkeleydb/makefile.mk	4 Mar 2006 10:56:19 -0000	1.30.6.2
-@@ -86,6 +86,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.149
-diff -u -r1.149 configure
---- config_office/configure	5 May 2006 11:32:59 -0000	1.149
-+++ config_office/configure	9 May 2006 22:08:51 -0000
-@@ -309,7 +309,7 @@
- # 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 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_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 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.
-@@ -7705,9 +7705,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
-@@ -7746,12 +7751,12 @@
- 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 +8205,59 @@
-    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
-+
- 
- 
- 
-@@ -21115,9 +21173,8 @@
- 	</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"
-@@ -21144,9 +21201,9 @@
-     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
-@@ -21963,6 +22020,8 @@
- 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