[cp-patches] FYI: Fix default source to bytecode compiler

[Mark Wielaard]

Hi,

All our documentation claims that the default source to bytecode
compiler is gcj, but in lib/Makefile.am we still take jikes. Fixed as
follows:

2004-07-29  Mark Wielaard  <address@hidden>

       * lib/Makefile.am: Default to gcj as source to bytecode compiler.

This might also explain why I never saw any gcj issues with make
distcheck since that also defaulted to jikes if it was installed on the
machine. This patch was tested with a make distcheck for gcj Debian
1:3.3.4-3 and CVS head 3.5.0 20040729 (experimental).
Committed.

Cheers,

Mark

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.61
diff -u -r1.61 Makefile.am
--- lib/Makefile.am     29 Jul 2004 08:10:46 -0000      1.61
+++ lib/Makefile.am     29 Jul 2004 19:51:30 -0000
@@ -16,15 +16,13 @@
 propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -type d 
! -regex .*CVS)
 propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java -name 
\*\.properties)
 
-#-----------------------------------------------------------------
-# handling javac definition including programs like jikes here
-#-----------------------------------------------------------------
-if FOUND_JIKES
-JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB)
 -d . @classes
-else
+# handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
 JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB)
 -C -d . @classes
 else
+if FOUND_JIKES
+JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB)
 -d . @classes
+else
 if FOUND_KJC
 JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
 endif # FOUND_KJC

signature.asc
Description: This is a digitally signed message part