Index: configure
===================================================================
--- configure	(revision 226715)
+++ configure	(working copy)
@@ -25874,11 +25874,15 @@
 
 if test "x${COMPILE_GJDOC}" = xyes
 then
-ac_config_files="$ac_config_files tools/gjdoc"
+if test -z "$CREATE_WRAPPERS_TRUE"; then :
+  else
+  ac_config_files="$ac_config_files tools/gjdoc"
 
 ac_config_commands="$ac_config_commands gjdoc"
 
+
 fi
+fi
 
 ac_config_commands="$ac_config_commands gen-classlist"
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 226715)
+++ configure.ac	(working copy)
@@ -1256,8 +1256,10 @@
 
 if test "x${COMPILE_GJDOC}" = xyes
 then
-AC_CONFIG_FILES([tools/gjdoc])
+CLASSPATH_COND_IF([CREATE_WRAPPERS], [test "x${COMPILE_WRAPPERS}" = xyes], [],
+[AC_CONFIG_FILES([tools/gjdoc])
 AC_CONFIG_COMMANDS([gjdoc], [chmod 755 tools/gjdoc])
+])
 fi
 
 AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
Index: tools/Makefile.am
===================================================================
--- tools/Makefile.am	(revision 226715)
+++ tools/Makefile.am	(working copy)
@@ -118,24 +118,7 @@
 noinst_SCRIPTS += gjdoc
 endif
 bin_PROGRAMS =
-## FIXME: remove these unneeded dependency lines once we can
-## require Automake 1.11.
-gappletviewer: gappletviewer.in
-gjarsigner: gjarsigner.in
-gkeytool: gkeytool.in
-gjar: gjar.in
-gnative2ascii: gnative2ascii.in
-gserialver: gserialver.in
-gjavah: gjavah.in
-grmiregistry: grmiregistry.in
-gtnameserv: gtnameserv.in
-gorbd: gorbd.in
-grmid: grmid.in
-grmic: grmic.in
-if CREATE_GJDOC
-gjdoc: gjdoc.in
 endif
-endif
 EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \
 	gjar.in gnative2ascii.in gserialver.in gjavah.in grmiregistry.in \
 	gtnameserv.in gorbd.in grmid.in grmic.in gjdoc.in
Index: tools/Makefile.in
===================================================================
--- tools/Makefile.in	(revision 226715)
+++ tools/Makefile.in	(working copy)
@@ -782,8 +782,8 @@
 @CREATE_WRAPPERS_FALSE@	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 @CREATE_WRAPPERS_FALSE@gjavah: $(top_builddir)/config.status $(srcdir)/gjavah.in
 @CREATE_WRAPPERS_FALSE@	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-gjdoc: $(top_builddir)/config.status $(srcdir)/gjdoc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+@CREATE_WRAPPERS_FALSE@gjdoc: $(top_builddir)/config.status $(srcdir)/gjdoc.in
+@CREATE_WRAPPERS_FALSE@	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -867,9 +867,6 @@
 @CREATE_WRAPPERS_TRUE@gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) $(EXTRA_gjavah_DEPENDENCIES) 
 @CREATE_WRAPPERS_TRUE@	@rm -f gjavah$(EXEEXT)
 @CREATE_WRAPPERS_TRUE@	$(gjavah_LINK) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
-@CREATE_GJDOC_FALSE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) $(EXTRA_gjdoc_DEPENDENCIES) 
-@CREATE_GJDOC_FALSE@	@rm -f gjdoc$(EXEEXT)
-@CREATE_GJDOC_FALSE@	$(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS)
 @CREATE_WRAPPERS_TRUE@gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) $(EXTRA_gjdoc_DEPENDENCIES) 
 @CREATE_WRAPPERS_TRUE@	@rm -f gjdoc$(EXEEXT)
 @CREATE_WRAPPERS_TRUE@	$(gjdoc_LINK) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS)
@@ -1342,19 +1339,6 @@
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-binSCRIPTS
 
-@CREATE_WRAPPERS_FALSE@gappletviewer: gappletviewer.in
-@CREATE_WRAPPERS_FALSE@gjarsigner: gjarsigner.in
-@CREATE_WRAPPERS_FALSE@gkeytool: gkeytool.in
-@CREATE_WRAPPERS_FALSE@gjar: gjar.in
-@CREATE_WRAPPERS_FALSE@gnative2ascii: gnative2ascii.in
-@CREATE_WRAPPERS_FALSE@gserialver: gserialver.in
-@CREATE_WRAPPERS_FALSE@gjavah: gjavah.in
-@CREATE_WRAPPERS_FALSE@grmiregistry: grmiregistry.in
-@CREATE_WRAPPERS_FALSE@gtnameserv: gtnameserv.in
-@CREATE_WRAPPERS_FALSE@gorbd: gorbd.in
-@CREATE_WRAPPERS_FALSE@grmid: grmid.in
-@CREATE_WRAPPERS_FALSE@grmic: grmic.in
-@CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@gjdoc: gjdoc.in
 
 # Make sure everything is included in the distribution.
 dist-hook: