2007-02-28 Thomas Fitzsimmons <fitzsim@redhat.com>

	* INSTALL: Document --with-ecj-jar configure option and ecj jar
	requirement for com.sun.tools.javac support.
	* configure.ac: Add --with-ecj-jar configure option.
	* gnu/classpath/Configuration.java.in (ECJ_JAR): New field.
	* tools/Makefile.am: Build decendents of com and sun directories.
	* resource/com/sun/tools/javac/messages.properties,
	resource/sun/rmi/rmic/messages.properties,
	tools/com/sun/javadoc/ClassDoc.java,
	tools/com/sun/javadoc/ConstructorDoc.java,
	tools/com/sun/javadoc/Doc.java,
	tools/com/sun/javadoc/DocErrorReporter.java,
	tools/com/sun/javadoc/Doclet.java,
	tools/com/sun/javadoc/ExecutableMemberDoc.java,
	tools/com/sun/javadoc/FieldDoc.java,
	tools/com/sun/javadoc/MemberDoc.java,
	tools/com/sun/javadoc/MethodDoc.java,
	tools/com/sun/javadoc/PackageDoc.java,
	tools/com/sun/javadoc/ParamTag.java,
	tools/com/sun/javadoc/Parameter.java,
	tools/com/sun/javadoc/ProgramElementDoc.java,
	tools/com/sun/javadoc/RootDoc.java,
	tools/com/sun/javadoc/SeeTag.java,
	tools/com/sun/javadoc/SerialFieldTag.java,
	tools/com/sun/javadoc/SourcePosition.java,
	tools/com/sun/javadoc/Tag.java,
	tools/com/sun/javadoc/ThrowsTag.java,
	tools/com/sun/javadoc/Type.java,
	tools/com/sun/javadoc/TypeVariable.java,
	tools/com/sun/tools/doclets/Taglet.java,
	tools/com/sun/tools/javac/Main.java,
	tools/com/sun/tools/javac/Messages.java,
	tools/sun/rmi/rmic/Main.java, tools/sun/rmi/rmic/Messages.java:
	New files.

1 files changed, 23 insertions, 2 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0241398f8..c1c5791b6 100755
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -14,6 +14,16 @@ error dunno how to setup the JCOMPILER and compile
 endif
 endif
 
+if FOUND_ECJ_JAR
+COM_SUN_TOOLS_JAVAC = com/sun/tools/javac
+ABS_COM_SUN_TOOLS_JAVAC = $(srcdir)/$(COM_SUN_TOOLS_JAVAC)
+ABS_COM_SUN_TOOLS_JAVAC_SRCS = $(ABS_COM_SUN_TOOLS_JAVAC)/*.java
+else
+COM_SUN_TOOLS_JAVAC =
+ABS_COM_SUN_TOOLS_JAVAC =
+ABS_COM_SUN_TOOLS_JAVAC_SRCS =
+endif
+
 if CREATE_WRAPPERS
 bin_SCRIPTS =
 bin_PROGRAMS = gappletviewer gjarsigner gkeytool \
@@ -100,6 +110,10 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
 
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \
+	$(srcdir)/com/sun/javadoc/*.java \
+	$(srcdir)/com/sun/tools/doclets/*.java \
+	$(ABS_COM_SUN_TOOLS_JAVAC_SRCS) \
+	$(srcdir)/sun/rmi/rmic/*.java \
 	$(srcdir)/external/asm/org/objectweb/asm/*.java \
 	$(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
 	$(srcdir)/external/asm/org/objectweb/asm/commons/*.java \
@@ -154,11 +168,18 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
 	find $(srcdir)/external/asm -name '*.java' -print > asm.lst
 	AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
 	  $$AC -g -d asm @asm.lst
-	find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst
+	find $(srcdir)/gnu/classpath/tools \
+	     $(srcdir)/com/sun/javadoc \
+	     $(srcdir)/com/sun/tools/doclets \
+	     $(ABS_COM_SUN_TOOLS_JAVAC) \
+	     $(srcdir)/sun/rmi/rmic \
+	     -name '*.java' -print > classes.lst
 	$(JCOMPILER) -g -d classes @classes.lst
 	cat classes.lst asm.lst > all-classes.lst
 ## Copy over tools resource files.
-	@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools -name \*.properties -print`; \
+	@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
+	       com/sun/javadoc com/sun/tools/doclets $(COM_SUN_TOOLS_JAVAC) \
+	       sun/rmi/rmic -name \*.properties -print`; \
 	for p in $$list; do \
 	  dirname=classes/`dirname $$p`; \
 	  if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \