Makefile.in (JAVAGC): New macro.

	* Makefile.in (JAVAGC): New macro.
	* configure: Rebuilt.
	* configure.in: Recognize --enable-java-gc argument.  Subst
	`JAVAGC' variable.

From-SVN: r23611

gcc/ChangeLog

+Wed Nov 11 12:25:19 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in (JAVAGC): New macro.
+	* configure: Rebuilt.
+	* configure.in: Recognize --enable-java-gc argument.  Subst
+	`JAVAGC' variable.
+
 Thu Nov 12 03:32:16 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	Handle equivalences that have been obscured by gcse:
@@ -1193,6 +1200,7 @@ Thu Oct 22 15:46:23 1998  Per Bothner (bothner@cygnus.com)
 	* Makefile.in (distdir-cvs, distdir-start):  Clean up so it
 	works if "$(srcdir)" != ".".
 
+>>>>>>> 1.2469
 Wed Oct 21 19:23:59 1998  Jim Wilson  <wilson@cygnus.com>
 
 	* expmed.c (store_bit_field): If need to add a SUBREG, then remove

gcc/Makefile.in

@@ -247,6 +247,7 @@ lang_options_files=@lang_options_files@
 lang_tree_files=@lang_tree_files@
 GCC_THREAD_FILE=@thread_file@
 OBJC_BOEHM_GC=@objc_boehm_gc@
+JAVAGC=@JAVAGC@
 GTHREAD_FLAGS=@gthread_flags@
 # Be prepared for gcc2 merges.
 gcc_version=@gcc_version@

gcc/configure.in

@@ -270,6 +270,13 @@ else
 fi,
 objc_boehm_gc='')
 
+AC_ARG_ENABLE(java-gc,
+changequote(<<,>>)dnl
+<<  --enable-java-gc=TYPE   choose garbage collector [boehm]>>,
+changequote([,])
+  JAVAGC=$enableval,
+  JAVAGC=boehm)
+
 # Determine the host, build, and target systems
 AC_CANONICAL_SYSTEM
 
@@ -4061,6 +4068,7 @@ AC_SUBST(lang_options_files)
 AC_SUBST(lang_tree_files)
 AC_SUBST(thread_file)
 AC_SUBST(objc_boehm_gc)
+AC_SUBST(JAVAGC)
 AC_SUBST(gcc_version)
 AC_SUBST(gcc_version_trigger)
 AC_SUBST(local_prefix)