Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/gjdoc/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- Makefile.am	20 Dec 2004 21:27:52 -0000	1.15
+++ Makefile.am	1 Feb 2005 14:30:20 -0000
@@ -16,13 +16,18 @@ bin_PROGRAMS = gjdoc
 lib_LTLIBRARIES = lib-com-sun-javadoc.la lib-com-sun-tools-doclets-Taglet.la \
 	lib-gnu-classpath-tools-gjdoc.la
 
-gjdoc_SOURCES =
+gjdoc_SOURCES = 
 gjdoc_LINK = $(GCJLINK)
 gjdoc_LDADD = -l-com-sun-javadoc -l-com-sun-tools-doclets-Taglet \
-	-l-gnu-classpath-tools-gjdoc \
-	-l-gnu-xml -lxmlj
+	-l-gnu-classpath-tools-gjdoc antlr.so \
+	$(jni_linkflag)
+
 gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \
 	-Dgnu.gcj.runtime.VMClassLoader.library_control=never
+gjdoc_DEPENDENCIES = lib-com-sun-javadoc.la \
+	lib-com-sun-tools-doclets-Taglet.la \
+	lib-gnu-classpath-tools-gjdoc.la \
+	antlr.so
 
 lib_com_sun_javadoc_la_SOURCES = \
 	src/com/sun/javadoc/ClassDoc.java \
@@ -49,12 +54,30 @@ lib_com_sun_javadoc_la_SOURCES = \
 lib_com_sun_tools_doclets_Taglet_la_SOURCES = \
 	src/com/sun/tools/doclets/Taglet.java
 
+if ENABLE_XMLDOCLETS
+XML_SRC = \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/Driver.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
+	src/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
+else
+XML_SRC =
+endif
+
 lib_gnu_classpath_tools_gjdoc_la_SOURCES = \
 	$(lib_gnu_classpath_tools_gjdoc_la_BASE_SOURCES) \
 	gnu/classpath/tools/gjdoc/expr/JavaLexer.java \
 	gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java \
 	gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java \
-	antlr.jar 
+	$(XML_SRC)
+
+noinst_DATA = \
+	antlr.jar
 
 lib_gnu_classpath_tools_gjdoc_la_BASE_SOURCES = \
 	src/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java \
@@ -77,16 +100,7 @@ lib_gnu_classpath_tools_gjdoc_la_BASE_SO
 	src/gnu/classpath/tools/doclets/PackageMatcher.java \
 	src/gnu/classpath/tools/doclets/StandardTaglet.java \
 	src/gnu/classpath/tools/doclets/TagletPrinter.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/Driver.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java \
 	src/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java \
-	src/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java \
 	src/gnu/classpath/tools/FileSystemClassLoader.java \
 	src/gnu/classpath/tools/IOToolkit.java \
 	src/gnu/classpath/tools/StringToolkit.java \
@@ -244,6 +258,8 @@ gnu_classpath_tools_gjdoc_jar_ENTS = \
 	dtd/ent/iso-pub.ent \
 	dtd/ent/iso-tech.ent
 
+EXTRA_DIST = java-expression.g
+
 gnu_classpath_tools_gjdoc_jar_HTML = doctranslets/html/res/default_help_en.html
 
 gnu_classpath_tools_gjdoc_jar_JS = \
@@ -419,5 +435,8 @@ install-data-hook:
 	$(LN_S) -f $(datadir)/java/com-sun-tools-doclets-Taglet-$(VERSION).jar $(datadir)/java/ext/com-sun-tools-doclets-Taglet.jar
 	$(LN_S) -f $(datadir)/java/gnu-classpath-tools-gjdoc-$(VERSION).jar $(datadir)/java/ext/gnu-classpath-tools-gjdoc.jar
 
+antlr.so: antlr.jar
+	$(GCJ) -shared $(AM_GCJFLAGS) $(GCJFLAGS) -c -o $@ $<
+
 antlr.jar:
 	cp $(ANTLR_JAR) antlr.jar
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/gjdoc/configure.ac,v
retrieving revision 1.5
diff -u -p -r1.5 configure.ac
--- configure.ac	13 Dec 2004 17:39:51 -0000	1.5
+++ configure.ac	1 Feb 2005 14:30:20 -0000
@@ -12,6 +12,13 @@ AC_CHECK_CLASSPATH
 AC_PROG_JAVA
 AC_PROG_ANTLR(2,7,1)
 
+AC_SUBST(CLASSPATH)
+
+AC_ARG_ENABLE([xmldoclets],
+              AS_HELP_STRING([--enable-xmldoclets],
+                             [enable doclets requiring XML]), [
+jni_linkflag="-lgnu-xml -lxmlj"
+enable_xmldoclets=yes
 dnl Check if gnujaxp.jar is in $prefix/share/java and prepend it to the
 dnl CLASSPATH.
 
@@ -35,8 +42,14 @@ AC_CHECK_FILE([$jaxp_prefix/share/java/g
   fi
 )
 
-AC_SUBST(CLASSPATH)
-
 AC_CHECK_RQRD_CLASS([javax.xml.transform.Transformer])
+],
+[
+jni_linkflag=""
+enable_xmldoclets=no
+])
+
+AC_SUBST(jni_linkflag)
+AM_CONDITIONAL([ENABLE_XMLDOCLETS], [test x${enable_xmldoclets} = xyes])
 
 AC_OUTPUT([Makefile])