[ecj] Patch: FYI: don't re-use maintainer-mode

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in on the gcj-eclipse-merge-branch.

I think we don't want to reuse --enable-maintainer-mode for compiling
the java sources, since this would negatively impact other gcc
developers who have no interest in navigating this.

So, I've add a new configure option --enable-java-maintainer-mode
which controls these bits.

Tom

2006-12-15  Tom Tromey  <tromey@redhat.com>

	* doc/install.texi (Prerequisites): Mention
	--enable-java-maintainer-mode.

2006-12-15  Tom Tromey  <tromey@redhat.com>

	* configure, Makefile.in: Rebuilt.
	* Makefile.am (gcjh.stamp): Use JAVA_MAINTAINER_MODE.
	* configure.ac: Added --enable-java-maintainer-mode.

2006-12-15  Tom Tromey  <tromey@redhat.com>

	* configure, lib/Makefile.in: Rebuilt.
	* lib/Makefile.am (compile-classes): Use JAVA_MAINTAINER_MODE.
	* configure.ac: Added --enable-java-maintainer-mode.

Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(revision 119844)
+++ gcc/doc/install.texi	(working copy)
@@ -432,12 +432,13 @@
 own sources.
 
 @item ecj1
+@itemx gjavah
 
 If you wish to modify @file{.java} files in libjava, you will need to
-configure with @code{--enable-maintainer-mode}, and you will need to
-have an executable named @code{ecj1} on your path.  This executable
-should run the Eclipse Java compiler via the GCC-specific entry point.
-You can download a suitable jar from
+configure with @code{--enable-java-maintainer-mode}, and you will need
+to have executables named @code{ecj1} and @code{gjavah} on your path.
+The @code{ecj1} executable should run the Eclipse Java compiler via
+the GCC-specific entry point.  You can download a suitable jar from
 @uref{ftp://sources.redhat.com/pub/java/}, or by running the script
 @file{contrib/download_ecj}.
 
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 119945)
+++ libjava/configure.ac	(working copy)
@@ -106,6 +106,11 @@
     [gconf_enabled=no]
 )
 
+AC_ARG_ENABLE(java-maintainer-mode,
+	AS_HELP_STRING([--enable-java-maintainer-mode],
+	[allow rebuilding of .class and .h files]))
+AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 GCC_NO_EXECUTABLES
 
Index: libjava/classpath/configure.ac
===================================================================
--- libjava/classpath/configure.ac	(revision 119945)
+++ libjava/classpath/configure.ac	(working copy)
@@ -11,6 +11,13 @@
 
 AC_CANONICAL_TARGET
 
+dnl GCJ LOCAL
+AC_ARG_ENABLE(java-maintainer-mode,
+	AS_HELP_STRING([--enable-java-maintainer-mode],
+	[allow rebuilding of .class and .h files]))
+AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
+dnl END GCJ LOCAL
+
 dnl -----------------------------------------------------------
 dnl Fold all IA-32 CPU architectures into "x86"
 dnl -----------------------------------------------------------
Index: libjava/classpath/lib/Makefile.am
===================================================================
--- libjava/classpath/lib/Makefile.am	(revision 119945)
+++ libjava/classpath/lib/Makefile.am	(working copy)
@@ -166,7 +166,7 @@
 # 	touch compile-classes
 # else
 compile-classes: classes $(JAVA_SRCS) Makefile
-if MAINTAINER_MODE
+if JAVA_MAINTAINER_MODE
 	$(JAVAC)
 endif
 	touch compile-classes
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am	(revision 119945)
+++ libjava/Makefile.am	(working copy)
@@ -399,7 +399,7 @@
 $(generic_header_files): gcjh.stamp
 
 gcjh.stamp: classpath/lib/compile-classes
-if MAINTAINER_MODE
+if JAVA_MAINTAINER_MODE
 	$(MYGCJH) --cni --all $(srcdir)/classpath/lib \
 	    --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force
 endif