--- a/configure	Sun Feb 26 22:51:04 2006 +0000
+++ b/configure	Mon Feb 27 16:29:29 2006 +0000
@@ -1174,10 +1174,10 @@
   --with-pdump            Enable portable LISP preloader.
   --with-dump-in-exec     Enable dumping into executable (enabled by default
                           for `pdump', not enabled by default in combination
-                          with `mc-alloc').
-  --with-kkcc             Enable experimental new GC algorithms.
-  --with-mc-alloc         Enable experimental new allocator.
-  --with-newgc            Enable new incremental garbage collector.
+                          with `newgc').
+  --with-kkcc             Enable experimental new GC mark algorithms.
+  --with-newgc            Enable new incremental garbage collector and new
+                          allocator.
   --with-vdb=TYPE         Override auto-detection of virtual-dirty-bit
                           write-barrier implementation for the new garbage
                           collector. TYPE must be one of "auto" (for
@@ -3575,24 +3575,7 @@
 else
   enable_kkcc=yes
 fi;
-# If --with-mc-alloc or --without-mc-alloc were given then copy the value to the
-# equivalent enable_mc-alloc variable.
-if test "${with_mc_alloc+set}" = set; then
-  enable_mc_alloc="$with_mc_alloc"
-fi;
-# If -enable-mc-alloc or --disable-mc-alloc were given then copy the value to the
-# equivalent with_mc-alloc variable.
-if test "${enable_mc_alloc+set}" = set; then
-  with_mc_alloc="$enable_mc_alloc"
-fi;
-# Check whether --with-mc-alloc or --without-mc-alloc was given.
-if test "${with_mc_alloc+set}" = set; then
-  enableval="$with_mc_alloc"
-  withval="$with_mc_alloc"
-
-else
-  enable_mc_alloc=yes
-fi;
+
 # If --with-newgc or --without-newgc were given then copy the value to the
 # equivalent enable_newgc variable.
 if test "${with_newgc+set}" = set; then
@@ -8996,11 +8979,10 @@
 fi
 
 test -z "$enable_kkcc" && enable_kkcc=yes
-test -z "$enable_mc_alloc" && enable_mc_alloc=yes
 
 if test -z "$enable_dump_in_exec"; then
   if test "$enable_pdump" = "yes"; then
-    if test "$enable_mc_alloc" = "yes"; then
+    if test "$enable_newgc" = "yes"; then
       enable_dump_in_exec=no
     else
       enable_dump_in_exec=yes
@@ -9009,7 +8991,6 @@
 fi
 
 if test "$enable_newgc" = "yes"; then
-  enable_mc_alloc=yes
   enable_kkcc=yes
 fi
 
@@ -39163,10 +39144,6 @@
 #define USE_KKCC 1
 _ACEOF
 
-test "$enable_mc_alloc"    = "yes" && cat >>confdefs.h <<\_ACEOF
-#define MC_ALLOC 1
-_ACEOF
-
 test "$enable_newgc"       = "yes" && cat >>confdefs.h <<\_ACEOF
 #define NEW_GC 1
 _ACEOF
@@ -39481,22 +39458,14 @@
   echo "  WARNING: ---------------------------------------------------------"
 fi
 if test "$enable_kkcc" = yes ; then
-  echo "  Using the new GC algorithms."
+  echo "  Using the new GC mark algorithms (KKCC)."
   echo "  WARNING: ---------------------------------------------------------"
   echo "  WARNING: The new algorithms are experimental. They are enabled by"
   echo "  WARNING: default for this release. Use \`--disable-kkcc' to"
   echo "  WARNING: turn it off."
   echo "  WARNING: ---------------------------------------------------------"
 fi
-if test "$enable_mc_alloc" = yes ; then
-  echo "  Using the new allocator."
-  echo "  WARNING: ---------------------------------------------------------"
-  echo "  WARNING: The new allocator is experimental. It is enabled by"
-  echo "  WARNING: default for this release. Use \`--disable-mc-alloc' to"
-  echo "  WARNING: turn it off."
-  echo "  WARNING: ---------------------------------------------------------"
-fi
-test "$enable_newgc" = yes && echo "  Using the new incremental garbage collector."
+test "$enable_newgc" = yes && echo "  Using the new incremental garbage collector and the new allocator."
 if test "$have_vdb_posix" = yes ; then
   if test "$have_vdb_sigaction" = yes ; then
     echo "  Using POSIX sigaction() to install fault handler."