diff --git a/src/c/Makefile.in b/src/c/Makefile.in
index 421c9232e..698c06be3 100644
--- a/src/c/Makefile.in
+++ b/src/c/Makefile.in
@@ -77,9 +77,9 @@ $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list.h $(srcdir)/functions_list.h
 # dangerous to optimize due to assembler hack
 #	$(CC) $(CFLAGS) -O0 -g apply.c -o $@
 assignment.o: assignment.c $(HFILES)
-	$(CC) $(CFLAGS) assignment.c -o $@
+	$(CC) $(CFLAGS) -O0 assignment.c -o $@
 gbc.o: gbc.c $(HFILES)
-	$(CC) $(CFLAGS) gbc.c -o $@
+	$(CC) $(CFLAGS) -O0 gbc.c -o $@
 symbols_def.o: $(srcdir)/symbols_list.h
 	echo '#include "ecl.h"' > symbols_def.c
 	cat $(srcdir)/symbols_list.h | grep 'SW("' | grep -v 'NULL[,)]' | sed 's/SW(".*&\([a-zA-Z_0-9]*\)),/cl_object \1;/g' >> symbols_def.c
diff --git a/src/c/all_symbols.d b/src/c/all_symbols.d
index d0a76159a..26b3857bd 100644
--- a/src/c/all_symbols.d
+++ b/src/c/all_symbols.d
@@ -4,7 +4,7 @@
 
 #include "symbols_list.h"
 
-struct symbol cl_symbols[393];
+cl_index cl_num_symbols_in_core = 0;
 
 @(defun si::mangle-name (symbol &optional as_symbol)
 	int l;
@@ -17,18 +17,19 @@ struct symbol cl_symbols[393];
 	assert_type_symbol(symbol);
 	is_symbol = (as_symbol == Cnil);
 	if (is_symbol) {
+		cl_fixnum p;
+
 		if (symbol == Cnil)
 			@(return Ct make_simple_string("Cnil"))
 		else if (symbol == Ct)
 			@(return Ct make_simple_string("Ct"))
-		for (l = 0; all_symbols[l].name != NULL; l++) {
-			if (symbol == (cl_object)(cl_symbols + l)) {
-				found = Ct;
-				output = @format(3, Cnil,
-						 make_constant_string("((cl_object)(cl_symbols+~A))"),
-						 MAKE_FIXNUM(l));
-				@(return found output)
-			}
+		p  = (cl_symbol_initializer*)symbol - cl_symbols;
+		if (p >= 0 && p <= cl_num_symbols_in_core) {
+			found = Ct;
+			output = @format(3, Cnil,
+					 make_constant_string("((cl_object)(cl_symbols+~A))"),
+					 MAKE_FIXNUM(p));
+			@(return found output)
 		}
 	} else {
 		cl_object fun;
@@ -119,6 +120,7 @@ make_this_symbol(int index, const char *name, cl_object package, bool special)
 {
 	cl_object s = (cl_object)(cl_symbols + index);
 	s->symbol.t = t_symbol;
+	s->symbol.mflag = FALSE;
 	SYM_VAL(s) = OBJNULL;
 	SYM_FUN(s) = OBJNULL;
 	s->symbol.plist = Cnil;
@@ -126,14 +128,14 @@ make_this_symbol(int index, const char *name, cl_object package, bool special)
 	s->symbol.stype = special? stp_special : stp_ordinary;
 	s->symbol.mflag = FALSE;
 	s->symbol.isform = FALSE;
-	s->symbol.name = make_constant_string(name);
 	s->symbol.hpack = package;
-	cl_import(s, package);
+	s->symbol.name = make_constant_string(name);
 	sethash(s->symbol.name, package->pack.external, s);
 	if (package == keyword_package) {
 		s->symbol.stype = stp_constant;
 		SYM_VAL(s) = s;
 	}
+	cl_num_symbols_in_core = index + 1;
 }
 
 void
@@ -142,24 +144,26 @@ init_all_symbols(void)
 	int i;
 
 	/* We skip NIL and T */
-	for (i = 2; all_symbols[i].name != NULL; i++) {
-		switch (all_symbols[i].type) {
+	for (i = 2; cl_symbols[i].init.name != NULL; i++) {
+		cl_object *loc = cl_symbols[i].init.loc;
+
+		switch (cl_symbols[i].init.type) {
 		case CL_ORDINARY:
-			make_this_symbol(i, all_symbols[i].name, lisp_package, FALSE);
+			make_this_symbol(i, cl_symbols[i].init.name, lisp_package, FALSE);
 			break;
 		case CL_SPECIAL:
-			make_this_symbol(i, all_symbols[i].name, lisp_package, TRUE);
+			make_this_symbol(i, cl_symbols[i].init.name, lisp_package, TRUE);
 			break;
 		case SI_ORDINARY:
-			make_this_symbol(i, all_symbols[i].name+4, system_package, FALSE);
+			make_this_symbol(i, cl_symbols[i].init.name+4, system_package, FALSE);
 			break;
 		case SI_SPECIAL:
-			make_this_symbol(i, all_symbols[i].name+4, system_package, TRUE);
+			make_this_symbol(i, cl_symbols[i].init.name+4, system_package, TRUE);
 			break;
 		case KEYWORD:
-			make_this_symbol(i, all_symbols[i].name+1, keyword_package, TRUE);
+			make_this_symbol(i, cl_symbols[i].init.name+1, keyword_package, TRUE);
 		}
-		if (all_symbols[i].loc != NULL)
-		  *(all_symbols[i].loc) = (cl_object)(cl_symbols+i);
+		if (loc != NULL)
+			*loc = (cl_object)(cl_symbols+i);
 	}
 }
diff --git a/src/c/alloc.d b/src/c/alloc.d
index 43886f150..b6d4c6ae7 100644
--- a/src/c/alloc.d
+++ b/src/c/alloc.d
@@ -36,7 +36,7 @@
 #include "ecl.h"
 #include "page.h"
 
-#define USE_MMAP
+#undef USE_MMAP
 #ifdef USE_MMAP
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -749,17 +749,17 @@ t_from_type(cl_object type)
 	@(return Ct)
 @)
 
-@(defun si::maxpage (type)
+@(defun si::maximum-allocatable-pages (type)
 @
 	@(return MAKE_FIXNUM(tm_of(t_from_type(type))->tm_maxpage))
 @)
 
-@(defun si::allocated_pages (type)
+@(defun si::allocated-pages (type)
 @
 	@(return MAKE_FIXNUM(tm_of(t_from_type(type))->tm_npage))
 @)
 
-@(defun si::alloc_contpage (qty &optional (now Cnil))
+@(defun si::allocate-contiguous-pages (qty &optional (now Cnil))
 	cl_index i, m;
 	cl_ptr p;
 @
@@ -782,12 +782,12 @@ since ~D pages are already allocated.",
 	@(return Ct)
 @)
 
-@(defun si::ncbpage ()
+@(defun si::allocated-contiguous-pages ()
 @
 	@(return MAKE_FIXNUM(ncbpage))
 @)
 
-@(defun si::maxcbpage ()
+@(defun si::maximum-contiguous-pages ()
 @
 	@(return MAKE_FIXNUM(maxcbpage))
 @)
@@ -815,17 +815,10 @@ since ~D pages are already allocated.",
 	@(return flag)
 @)
 
-static cl_object @'si::*lisp-maxpages*', @'si::+lisp_pagesize+';
-
 void
 init_alloc_function(void)
 {
 	ignore_maximum_pages = TRUE;
-	@'si::*lisp-maxpages*' =
-		make_si_special("*LISP-MAXPAGES*", MAKE_FIXNUM(real_maxpage));
-	@'si::+lisp_pagesize+' =
-		make_si_constant("+LISP-PAGESIZE+", MAKE_FIXNUM(LISP_PAGESIZE));
-	SYM_VAL(@'si::*lisp-maxpages*') = MAKE_FIXNUM(real_maxpage);
 }
 
 #ifdef NEED_MALLOC
diff --git a/src/c/assignment.d b/src/c/assignment.d
index 9896bcbc6..fa2eb4e00 100644
--- a/src/c/assignment.d
+++ b/src/c/assignment.d
@@ -167,6 +167,7 @@ record_source_pathname(cl_object sym, cl_object def)
 void
 init_assignment(void)
 {
+	SYM_VAL(@'si::*inhibit-macro-special*') = Cnil;
 #ifdef PDE
 	SYM_VAL(@'si::*record-source-pathname-p*') = Cnil;
 #endif
diff --git a/src/c/dpp.c b/src/c/dpp.c
index 79826a629..e100d1cbe 100644
--- a/src/c/dpp.c
+++ b/src/c/dpp.c
@@ -225,9 +225,9 @@ search_keyword(const char *name)
 	if (i == 255)
 		error("Too long keyword");
 	c[i] = 0;
-	for (i = 0; all_symbols[i].name != NULL; i++) {
-		if (all_symbols[i].name[0] == ':')
-			if (!strcasecmp(c, all_symbols[i].name+1))
+	for (i = 0; cl_symbols[i].name != NULL; i++) {
+		if (cl_symbols[i].name[0] == ':')
+			if (!strcasecmp(c, cl_symbols[i].name+1))
 				return i;
 	}
 	printf("Keyword not found: %s.\n", c);
@@ -248,8 +248,8 @@ read_symbol()
 	}
 	pushc(0);
 
-	for (i = 0; all_symbols[i].name != NULL; i++) {
-		if (!strcasecmp(name, all_symbols[i].name)) {
+	for (i = 0; cl_symbols[i].name != NULL; i++) {
+		if (!strcasecmp(name, cl_symbols[i].name)) {
 			poolp = name;
 			pushstr("(cl_object)(cl_symbols+");
 			if (i >= 100)
diff --git a/src/c/error.d b/src/c/error.d
index 22a6f3259..caa7144fd 100644
--- a/src/c/error.d
+++ b/src/c/error.d
@@ -210,12 +210,7 @@ FEinvalid_function(cl_object obj)
 static
 @(defun "universal_error_handler" (c err args)
 @
-	printf("\nLisp initialization error.\n");
-	@print(1, err);
-	@print(1, args);
-#ifndef ALFA
-	exit(0);
-#endif
+	error("\nLisp initialization error.\n");
 @)
 
 void
diff --git a/src/c/functions_list.h b/src/c/functions_list.h
index 3241aa935..531a829c8 100644
--- a/src/c/functions_list.h
+++ b/src/c/functions_list.h
@@ -20,13 +20,14 @@ const struct {
 
 	/* alloc.c */
 
+	{"LOAD", SW("clLload",clLload,cl)},
 #if !defined(GBC_BOEHM)
 	{"SI::ALLOCATE", SW("siLallocate",siLallocate,si)},
 	{"SI::ALLOCATED-PAGES", SW("siLallocated_pages",siLallocated_pages,si)},
-	{"SI::MAXIMUM-ALLOCATABLE-PAGES", SW("siLmaxpage",siLmaxpage,si)},
-	{"SI::ALLOCATE-CONTIGUOUS-PAGES", SW("siLalloc_contpage",siLalloc_contpage,si)},
-	{"SI::ALLOCATED-CONTIGUOUS-PAGES", SW("siLncbpage",siLncbpage,si)},
-	{"SI::MAXIMUM-CONTIGUOUS-PAGES", SW("siLmaxcbpage",siLmaxcbpage,si)},
+	{"SI::MAXIMUM-ALLOCATABLE-PAGES", SW("siLmaximum_allocatable_pages",siLmaximum_allocatable_pages,si)},
+	{"SI::ALLOCATE-CONTIGUOUS-PAGES", SW("siLallocate_contiguous_pages",siLallocate_contiguous_pages,si)},
+	{"SI::ALLOCATED-CONTIGUOUS-PAGES", SW("siLallocated_contiguous_pages",siLallocated_contiguous_pages,si)},
+	{"SI::MAXIMUM-CONTIGUOUS-PAGES", SW("siLmaximum_contiguous_pages",siLmaximum_contiguous_pages,si)},
 	{"SI::GET-HOLE-SIZE", SW("siLget_hole_size",siLget_hole_size,si)},
 	{"SI::SET-HOLE-SIZE", SW("siLset_hole_size",siLset_hole_size,si)},
 	{"SI::IGNORE-MAXIMUM-PAGES", SW("siLignore_maximum_pages",siLignore_maximum_pages,si)},
@@ -373,7 +374,6 @@ const struct {
 
 	/* load.d */
 
-	{"LOAD", SW("clLload",clLload,cl)},
 #ifdef ENABLE_DLOPEN
 	{"SI::LOAD-BINARY", SW("siLload_binary",siLload_binary,si)},
 #endif
diff --git a/src/c/gbc.d b/src/c/gbc.d
index aa006fb59..e88818e09 100644
--- a/src/c/gbc.d
+++ b/src/c/gbc.d
@@ -448,8 +448,15 @@ mark_phase(void)
 	frame_ptr frp;
 	cl_object *sp;
 
-	mark_object(Cnil);
-	mark_object(Ct);
+	/* mark registered symbols & keywords */
+	for (i=0; i<cl_num_symbols_in_core; i++) {
+		cl_object s = (cl_object)(cl_symbols + i);
+		s->symbol.m = FALSE;
+	}
+	for (i=0; i<cl_num_symbols_in_core; i++) {
+		cl_object s = (cl_object)(cl_symbols + i);
+		mark_object(s);
+	}
 
 #ifdef THREADS
 	{
@@ -537,17 +544,6 @@ mark_phase(void)
 	/* mark roots */
 	for (i = 0; i < gc_roots;  i++)
 		mark_object(*gc_root[i]);
-
-	/* mark registered symbols & keywords */
-	{
-	int i;
-	for (i=0; i<ECL_NUM_SYMBOLS_IN_CORE; i++)
-		mark_object((cl_object)(cl_symbols + i));
-
-	if (debug) {
-		printf("symbol navigation\n");
-		fflush(stdout);
-	}
 }
 
 static void
@@ -736,7 +732,7 @@ gc(cl_type t)
 #endif /* THREADS */
 
     if (GC_enter_hook != NULL)
-      (*GC_enter_hook)(0);
+      (*GC_enter_hook)();
 
     interrupt_enable = FALSE;
 
diff --git a/src/c/hash.d b/src/c/hash.d
index 44cdce085..33eb8a8cc 100644
--- a/src/c/hash.d
+++ b/src/c/hash.d
@@ -452,10 +452,7 @@ cl_make_hash_table(cl_object test, cl_object size, cl_object rehash_size,
 	h->hash.data = NULL;	/* for GC sake */
 	h->hash.data = (struct hashtable_entry *)
 	cl_alloc(hsize * sizeof(struct hashtable_entry));
-	for(i = 0;  i < hsize;  i++) {
-		h->hash.data[i].key = OBJNULL;
-		h->hash.data[i].value = OBJNULL;
-	}
+	cl_clear_hash_table(h);
 	return h;
 }
 
diff --git a/src/c/init.d b/src/c/init.d
index a2455245a..2c220d708 100644
--- a/src/c/init.d
+++ b/src/c/init.d
@@ -31,15 +31,17 @@ init_lisp(void)
 	init_symbol();
 	init_package();
 
+	/* These must come _after_ init_symbol() and init_package() */
+	GC_disable();
+	init_all_symbols();
+	init_all_functions();
+	GC_enable();
+
 #if !defined(GBC_BOEHM)
 	/* We need this because a lot of stuff is to be created */
 	init_GC();
 #endif
 
-	/* These must come _after_ init_symbol() and init_package() */
-	init_all_symbols();
-	init_all_functions();
-
 	SYM_VAL(@'*package*') = lisp_package;
 	SYM_VAL(@'*gensym_counter*') = MAKE_FIXNUM(0);
 
diff --git a/src/c/package.d b/src/c/package.d
index 31b597601..869d8fb11 100644
--- a/src/c/package.d
+++ b/src/c/package.d
@@ -84,11 +84,9 @@ make_package_hashtable()
 	h->hash.rehash_size = make_shortfloat(1.5);
 	h->hash.threshold = make_shortfloat(0.7);
 	h->hash.entries = 0;
+	h->hash.data = NULL; /* for GC sake */
 	h->hash.data = (struct hashtable_entry *)cl_alloc(hsize * sizeof(struct hashtable_entry));
-	for(i = 0;  i < hsize;  i++) {
-		h->hash.data[i].key = OBJNULL;
-		h->hash.data[i].value = OBJNULL;
-	}
+	cl_clear_hash_table(h);
 	return h;
 }
 
diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h
index 74fa3005e..9ff994001 100644
--- a/src/c/symbols_list.h
+++ b/src/c/symbols_list.h
@@ -7,18 +7,17 @@
 #ifdef DPP
 #define SW(a,b,c) a
 #else
-#define SW(a,b,c) {a, b, c}
+#define SW(a,b,c) {{a, b, c}}
 #endif
 
-#define ECL_NUM_SYMBOLS_IN_CORE	393
-
-const struct {
+#ifdef DPP
+struct {
 	const char *name;
-#ifndef DPP
-	int type;
-	cl_object *loc;
+}
+#else
+cl_symbol_initializer
 #endif
-} all_symbols[ECL_NUM_SYMBOLS_IN_CORE + 1] = {
+cl_symbols[] = {
 
 SW("NIL", CL_ORDINARY, NULL),
 SW("T", CL_ORDINARY, NULL),
diff --git a/src/configure b/src/configure
index eb04ddbc9..6dc35985b 100755
--- a/src/configure
+++ b/src/configure
@@ -643,7 +643,6 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
---disable-boehm        Disable Boehm's garbage collector.
 --enable-local-boehm   Use already installed Boehm GC library.
 --enable-local-gmp     Use already installed GMP library.
 --disable-shared       Enable building dynamically loadable extensions.
@@ -852,7 +851,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:855: loading site script $ac_site_file" >&5
+    { echo "$as_me:854: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -863,7 +862,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:866: loading cache $cache_file" >&5
+    { echo "$as_me:865: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -871,7 +870,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:874: creating cache $cache_file" >&5
+  { echo "$as_me:873: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -887,21 +886,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:890: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:889: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:894: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:893: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:900: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:899: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:902:   former value:  $ac_old_val" >&5
+        { echo "$as_me:901:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:904:   current value: $ac_new_val" >&5
+        { echo "$as_me:903:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -920,9 +919,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:923: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:922: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:925: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:924: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -942,10 +941,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:945: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:944: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:948: \$? = $ac_status" >&5
+  echo "$as_me:947: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -985,7 +984,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:988: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:987: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -995,11 +994,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:998: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:997: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1002: checking build system type" >&5
+echo "$as_me:1001: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1008,16 +1007,16 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1011: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1010: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:1015: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1014: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1020: result: $ac_cv_build" >&5
+echo "$as_me:1019: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1027,7 +1026,7 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 test -z "$build_alias" &&
   build_alias=$ac_cv_build
 
-echo "$as_me:1030: checking host system type" >&5
+echo "$as_me:1029: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1036,12 +1035,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:1039: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1038: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1044: result: $ac_cv_host" >&5
+echo "$as_me:1043: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1058,13 +1057,6 @@ if test "${with_tcp+set}" = set; then
   withval="$with_tcp"
   tcp="yes"
 fi;
-# Check whether --enable-boehm or --disable-boehm was given.
-if test "${enable_boehm+set}" = set; then
-  enableval="$enable_boehm"
-  boehm="${enableval}"
-else
-  boehm="yes"
-fi;
 # Check whether --enable-local-boehm or --disable-local-boehm was given.
 if test "${enable_local_boehm+set}" = set; then
   enableval="$enable_local_boehm"
@@ -1125,7 +1117,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1128: checking for $ac_word" >&5
+echo "$as_me:1120: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1140,7 +1132,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1143: found $ac_dir/$ac_word" >&5
+echo "$as_me:1135: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1148,10 +1140,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1151: result: $CC" >&5
+  echo "$as_me:1143: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1154: result: no" >&5
+  echo "$as_me:1146: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1160,7 +1152,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1163: checking for $ac_word" >&5
+echo "$as_me:1155: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1175,7 +1167,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1178: found $ac_dir/$ac_word" >&5
+echo "$as_me:1170: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1183,10 +1175,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1186: result: $ac_ct_CC" >&5
+  echo "$as_me:1178: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1189: result: no" >&5
+  echo "$as_me:1181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1199,7 +1191,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1202: checking for $ac_word" >&5
+echo "$as_me:1194: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1214,7 +1206,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1217: found $ac_dir/$ac_word" >&5
+echo "$as_me:1209: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1222,10 +1214,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1225: result: $CC" >&5
+  echo "$as_me:1217: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1228: result: no" >&5
+  echo "$as_me:1220: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1234,7 +1226,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1237: checking for $ac_word" >&5
+echo "$as_me:1229: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1249,7 +1241,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1252: found $ac_dir/$ac_word" >&5
+echo "$as_me:1244: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1257,10 +1249,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1260: result: $ac_ct_CC" >&5
+  echo "$as_me:1252: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1263: result: no" >&5
+  echo "$as_me:1255: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1273,7 +1265,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1276: checking for $ac_word" >&5
+echo "$as_me:1268: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1293,7 +1285,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1296: found $ac_dir/$ac_word" >&5
+echo "$as_me:1288: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1315,10 +1307,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1318: result: $CC" >&5
+  echo "$as_me:1310: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1321: result: no" >&5
+  echo "$as_me:1313: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1329,7 +1321,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1332: checking for $ac_word" >&5
+echo "$as_me:1324: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1344,7 +1336,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1347: found $ac_dir/$ac_word" >&5
+echo "$as_me:1339: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1352,10 +1344,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1355: result: $CC" >&5
+  echo "$as_me:1347: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1358: result: no" >&5
+  echo "$as_me:1350: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1368,7 +1360,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1371: checking for $ac_word" >&5
+echo "$as_me:1363: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1383,7 +1375,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1386: found $ac_dir/$ac_word" >&5
+echo "$as_me:1378: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1391,10 +1383,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1394: result: $ac_ct_CC" >&5
+  echo "$as_me:1386: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1397: result: no" >&5
+  echo "$as_me:1389: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1406,32 +1398,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1409: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1401: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1414:" \
+echo "$as_me:1406:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1417: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1409: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1420: \$? = $ac_status" >&5
+  echo "$as_me:1412: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1422: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1414: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1425: \$? = $ac_status" >&5
+  echo "$as_me:1417: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1427: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1419: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1430: \$? = $ac_status" >&5
+  echo "$as_me:1422: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1434 "configure"
+#line 1426 "configure"
 #include "confdefs.h"
 
 int
@@ -1447,13 +1439,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1450: checking for C compiler default output" >&5
+echo "$as_me:1442: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1453: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1445: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1456: \$? = $ac_status" >&5
+  echo "$as_me:1448: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1476,34 +1468,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1479: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1471: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1485: result: $ac_file" >&5
+echo "$as_me:1477: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1490: checking whether the C compiler works" >&5
+echo "$as_me:1482: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1499: \$? = $ac_status" >&5
+  echo "$as_me:1491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1506: error: cannot run C compiled programs.
+	{ { echo "$as_me:1498: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1511,24 +1503,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1514: result: yes" >&5
+echo "$as_me:1506: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1521: checking whether we are cross compiling" >&5
+echo "$as_me:1513: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1523: result: $cross_compiling" >&5
+echo "$as_me:1515: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1526: checking for executable suffix" >&5
+echo "$as_me:1518: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1531: \$? = $ac_status" >&5
+  echo "$as_me:1523: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1544,25 +1536,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1547: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1539: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1553: result: $ac_cv_exeext" >&5
+echo "$as_me:1545: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1559: checking for object suffix" >&5
+echo "$as_me:1551: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1565 "configure"
+#line 1557 "configure"
 #include "confdefs.h"
 
 int
@@ -1574,10 +1566,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1577: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1569: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1580: \$? = $ac_status" >&5
+  echo "$as_me:1572: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1589,24 +1581,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1592: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1584: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1599: result: $ac_cv_objext" >&5
+echo "$as_me:1591: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1603: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1595: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1609 "configure"
+#line 1601 "configure"
 #include "confdefs.h"
 
 int
@@ -1621,16 +1613,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1624: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1627: \$? = $ac_status" >&5
+  echo "$as_me:1619: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1633: \$? = $ac_status" >&5
+  echo "$as_me:1625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1642,19 +1634,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1645: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1637: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1651: checking whether $CC accepts -g" >&5
+echo "$as_me:1643: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1657 "configure"
+#line 1649 "configure"
 #include "confdefs.h"
 
 int
@@ -1666,16 +1658,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1672: \$? = $ac_status" >&5
+  echo "$as_me:1664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1678: \$? = $ac_status" >&5
+  echo "$as_me:1670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1685,7 +1677,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1688: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1680: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1712,16 +1704,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1718: \$? = $ac_status" >&5
+  echo "$as_me:1710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1724: \$? = $ac_status" >&5
+  echo "$as_me:1716: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1733,7 +1725,7 @@ if { (eval echo "$as_me:1715: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1736 "configure"
+#line 1728 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1746,16 +1738,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1749: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1752: \$? = $ac_status" >&5
+  echo "$as_me:1744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1758: \$? = $ac_status" >&5
+  echo "$as_me:1750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1765,7 +1757,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1768 "configure"
+#line 1760 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1777,16 +1769,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1783: \$? = $ac_status" >&5
+  echo "$as_me:1775: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1789: \$? = $ac_status" >&5
+  echo "$as_me:1781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1823,7 +1815,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1826: checking for $ac_word" >&5
+echo "$as_me:1818: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1838,7 +1830,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-echo "$as_me:1841: found $ac_dir/$ac_word" >&5
+echo "$as_me:1833: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1846,10 +1838,10 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:1849: result: $CXX" >&5
+  echo "$as_me:1841: result: $CXX" >&5
 echo "${ECHO_T}$CXX" >&6
 else
-  echo "$as_me:1852: result: no" >&5
+  echo "$as_me:1844: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1862,7 +1854,7 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1865: checking for $ac_word" >&5
+echo "$as_me:1857: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1877,7 +1869,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CXX="$ac_prog"
-echo "$as_me:1880: found $ac_dir/$ac_word" >&5
+echo "$as_me:1872: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1885,10 +1877,10 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:1888: result: $ac_ct_CXX" >&5
+  echo "$as_me:1880: result: $ac_ct_CXX" >&5
 echo "${ECHO_T}$ac_ct_CXX" >&6
 else
-  echo "$as_me:1891: result: no" >&5
+  echo "$as_me:1883: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1900,32 +1892,32 @@ test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 fi
 
 # Provide some information about the compiler.
-echo "$as_me:1903:" \
+echo "$as_me:1895:" \
      "checking for C++ compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1906: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1898: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1909: \$? = $ac_status" >&5
+  echo "$as_me:1901: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1911: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1903: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1914: \$? = $ac_status" >&5
+  echo "$as_me:1906: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1916: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1908: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1919: \$? = $ac_status" >&5
+  echo "$as_me:1911: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-echo "$as_me:1922: checking whether we are using the GNU C++ compiler" >&5
+echo "$as_me:1914: checking whether we are using the GNU C++ compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1928 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 
 int
@@ -1940,16 +1932,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1946: \$? = $ac_status" >&5
+  echo "$as_me:1938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1952: \$? = $ac_status" >&5
+  echo "$as_me:1944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1961,19 +1953,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1964: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "$as_me:1956: result: $ac_cv_cxx_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
 GXX=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
-echo "$as_me:1970: checking whether $CXX accepts -g" >&5
+echo "$as_me:1962: checking whether $CXX accepts -g" >&5
 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cxx_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1976 "configure"
+#line 1968 "configure"
 #include "confdefs.h"
 
 int
@@ -1985,16 +1977,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1991: \$? = $ac_status" >&5
+  echo "$as_me:1983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1997: \$? = $ac_status" >&5
+  echo "$as_me:1989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cxx_g=yes
 else
@@ -2004,7 +1996,7 @@ ac_cv_prog_cxx_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2007: result: $ac_cv_prog_cxx_g" >&5
+echo "$as_me:1999: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -2031,7 +2023,7 @@ for ac_declaration in \
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2034 "configure"
+#line 2026 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2044,16 +2036,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2050: \$? = $ac_status" >&5
+  echo "$as_me:2042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2056: \$? = $ac_status" >&5
+  echo "$as_me:2048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2063,7 +2055,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2066 "configure"
+#line 2058 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2075,16 +2067,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2070: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2081: \$? = $ac_status" >&5
+  echo "$as_me:2073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2087: \$? = $ac_status" >&5
+  echo "$as_me:2079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2111,7 +2103,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2114: checking how to run the C preprocessor" >&5
+echo "$as_me:2106: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2132,18 +2124,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2135 "configure"
+#line 2127 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2140: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2132: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2146: \$? = $ac_status" >&5
+  echo "$as_me:2138: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2166,17 +2158,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2169 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2173: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2165: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2179: \$? = $ac_status" >&5
+  echo "$as_me:2171: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2213,7 +2205,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2216: result: $CPP" >&5
+echo "$as_me:2208: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2223,18 +2215,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2226 "configure"
+#line 2218 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2231: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2223: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2237: \$? = $ac_status" >&5
+  echo "$as_me:2229: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2257,17 +2249,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2260 "configure"
+#line 2252 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2264: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2256: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2270: \$? = $ac_status" >&5
+  echo "$as_me:2262: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2295,7 +2287,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2298: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2290: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2309,7 +2301,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2312: checking for $ac_word" >&5
+echo "$as_me:2304: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2324,7 +2316,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2327: found $ac_dir/$ac_word" >&5
+echo "$as_me:2319: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2332,10 +2324,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2335: result: $RANLIB" >&5
+  echo "$as_me:2327: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2338: result: no" >&5
+  echo "$as_me:2330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2344,7 +2336,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2347: checking for $ac_word" >&5
+echo "$as_me:2339: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2359,7 +2351,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2362: found $ac_dir/$ac_word" >&5
+echo "$as_me:2354: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2368,10 +2360,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2371: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2363: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2374: result: no" >&5
+  echo "$as_me:2366: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2392,7 +2384,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2395: checking for a BSD compatible install" >&5
+echo "$as_me:2387: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2441,7 +2433,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2444: result: $INSTALL" >&5
+echo "$as_me:2436: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2452,19 +2444,19 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
        # sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM
-echo "$as_me:2455: checking whether ln -s works" >&5
+echo "$as_me:2447: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2459: result: yes" >&5
+  echo "$as_me:2451: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2462: result: no, using $LN_S" >&5
+  echo "$as_me:2454: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
           # sets variable LN_S
 
-echo "$as_me:2467: checking for getpwnam in -lsun" >&5
+echo "$as_me:2459: checking for getpwnam in -lsun" >&5
 echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6
 if test "${ac_cv_lib_sun_getpwnam+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2472,7 +2464,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsun  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2475 "configure"
+#line 2467 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2491,16 +2483,16 @@ getpwnam ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2486: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2497: \$? = $ac_status" >&5
+  echo "$as_me:2489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2503: \$? = $ac_status" >&5
+  echo "$as_me:2495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_sun_getpwnam=yes
 else
@@ -2511,7 +2503,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2514: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:2506: result: $ac_cv_lib_sun_getpwnam" >&5
 echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6
 if test $ac_cv_lib_sun_getpwnam = yes; then
   cat >>confdefs.h <<EOF
@@ -2526,23 +2518,23 @@ fi
 for ac_header in sys/resource.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2529: checking for $ac_header" >&5
+echo "$as_me:2521: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2535 "configure"
+#line 2527 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2539: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2545: \$? = $ac_status" >&5
+  echo "$as_me:2537: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2561,7 +2553,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2564: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2556: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2574,23 +2566,23 @@ done
 for ac_header in sys/utsname.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2577: checking for $ac_header" >&5
+echo "$as_me:2569: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2583 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2587: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2579: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2593: \$? = $ac_status" >&5
+  echo "$as_me:2585: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2609,7 +2601,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2612: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2604: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2622,23 +2614,23 @@ done
 for ac_header in float.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:2625: checking for $ac_header" >&5
+echo "$as_me:2617: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2631 "configure"
+#line 2623 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:2635: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2627: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2641: \$? = $ac_status" >&5
+  echo "$as_me:2633: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2657,7 +2649,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:2660: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:2652: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2670,13 +2662,13 @@ done
 for ac_func in nanosleep
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:2673: checking for $ac_func" >&5
+echo "$as_me:2665: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2679 "configure"
+#line 2671 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -2707,16 +2699,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2713: \$? = $ac_status" >&5
+  echo "$as_me:2705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2719: \$? = $ac_status" >&5
+  echo "$as_me:2711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -2726,7 +2718,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2729: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:2721: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2739,13 +2731,13 @@ done
 for ac_func in isnanf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:2742: checking for $ac_func" >&5
+echo "$as_me:2734: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2748 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -2776,16 +2768,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2771: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2782: \$? = $ac_status" >&5
+  echo "$as_me:2774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2788: \$? = $ac_status" >&5
+  echo "$as_me:2780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -2795,7 +2787,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2798: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:2790: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -2805,12 +2797,12 @@ EOF
 fi
 done
 
-echo "$as_me:2808: checking for POSIXized ISC" >&5
+echo "$as_me:2800: checking for POSIXized ISC" >&5
 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$as_me:2813: result: yes" >&5
+  echo "$as_me:2805: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
 
@@ -2824,7 +2816,7 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$as_me:2827: result: no" >&5
+  echo "$as_me:2819: result: no" >&5
 echo "${ECHO_T}no" >&6
   ISC=
 fi
@@ -2919,31 +2911,31 @@ eval `${CPP} -D${host} ${tempcname} \
        | sed -e 's/^configure___\([^=]*=\)[ ]*\(.*[^ ]\) */\1"\2"/'`
 rm ${tempcname}
 
-echo "$as_me:2922: checking for ld flags when building shared libraries" >&5
+echo "$as_me:2914: checking for ld flags when building shared libraries" >&5
 echo $ECHO_N "checking for ld flags when building shared libraries... $ECHO_C" >&6
 if test "${shared}" = "yes" -a "${SHARED_LDFLAGS}" ; then
-echo "$as_me:2925: result: ${SHARED_LDFLAGS}" >&5
+echo "$as_me:2917: result: ${SHARED_LDFLAGS}" >&5
 echo "${ECHO_T}${SHARED_LDFLAGS}" >&6
 else
 shared="no";
-echo "$as_me:2929: result: cannot build" >&5
+echo "$as_me:2921: result: cannot build" >&5
 echo "${ECHO_T}cannot build" >&6
 fi
-echo "$as_me:2932: checking for required libraries" >&5
+echo "$as_me:2924: checking for required libraries" >&5
 echo $ECHO_N "checking for required libraries... $ECHO_C" >&6
-echo "$as_me:2934: result: ${CLIBS}" >&5
+echo "$as_me:2926: result: ${CLIBS}" >&5
 echo "${ECHO_T}${CLIBS}" >&6
-echo "$as_me:2936: checking for architecture" >&5
+echo "$as_me:2928: checking for architecture" >&5
 echo $ECHO_N "checking for architecture... $ECHO_C" >&6
-echo "$as_me:2938: result: ${architecture}" >&5
+echo "$as_me:2930: result: ${architecture}" >&5
 echo "${ECHO_T}${architecture}" >&6
-echo "$as_me:2940: checking for software type" >&5
+echo "$as_me:2932: checking for software type" >&5
 echo $ECHO_N "checking for software type... $ECHO_C" >&6
-echo "$as_me:2942: result: ${software_type}" >&5
+echo "$as_me:2934: result: ${software_type}" >&5
 echo "${ECHO_T}${software_type}" >&6
-echo "$as_me:2944: checking for software version" >&5
+echo "$as_me:2936: checking for software version" >&5
 echo $ECHO_N "checking for software version... $ECHO_C" >&6
-echo "$as_me:2946: result: ${software_version}" >&5
+echo "$as_me:2938: result: ${software_version}" >&5
 echo "${ECHO_T}${software_version}" >&6
 
 if test "x$prefix" = "xNONE"; then prefix=${ac_default_prefix}; fi
@@ -3052,16 +3044,16 @@ else
   ECL_CC="${CXX}"
 fi
 
-  echo "$as_me:3055: checking whether stack growns downwards" >&5
+  echo "$as_me:3047: checking whether stack growns downwards" >&5
 echo $ECHO_N "checking whether stack growns downwards... $ECHO_C" >&6
 
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3059: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3051: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3064 "configure"
+#line 3056 "configure"
 #include "confdefs.h"
 
 char *f2() {
@@ -3083,17 +3075,17 @@ int main() {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3078: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3089: \$? = $ac_status" >&5
+  echo "$as_me:3081: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3094: \$? = $ac_status" >&5
+  echo "$as_me:3086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:3096: result: yes" >&5
+  echo "$as_me:3088: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define DOWN_STACK 1
@@ -3103,21 +3095,21 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3106: result: no" >&5
+echo "$as_me:3098: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-  echo "$as_me:3112: checking if arguments can be accessed through vector" >&5
+  echo "$as_me:3104: checking if arguments can be accessed through vector" >&5
 echo $ECHO_N "checking if arguments can be accessed through vector... $ECHO_C" >&6
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3115: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3107: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3120 "configure"
+#line 3112 "configure"
 #include "confdefs.h"
 
 #include <stdarg.h>
@@ -3143,23 +3135,23 @@ int main() {
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3138: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3149: \$? = $ac_status" >&5
+  echo "$as_me:3141: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3154: \$? = $ac_status" >&5
+  echo "$as_me:3146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:3156: result: yes" >&5
+  echo "$as_me:3148: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3162: result: no" >&5
+echo "$as_me:3154: result: no" >&5
 echo "${ECHO_T}no" >&6
 cat >>confdefs.h <<\EOF
 #define NO_ARGS_ARRAY 1
@@ -3169,15 +3161,15 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:3172: checking appropiate type for fixnums" >&5
+echo "$as_me:3164: checking appropiate type for fixnums" >&5
 echo $ECHO_N "checking appropiate type for fixnums... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3175: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3167: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3180 "configure"
+#line 3172 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
@@ -3193,18 +3185,18 @@ int main() {
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3199: \$? = $ac_status" >&5
+  echo "$as_me:3191: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3204: \$? = $ac_status" >&5
+  echo "$as_me:3196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cl_fixnum=`cat conftestval`
-echo "$as_me:3207: result: ${cl_fixnum}" >&5
+echo "$as_me:3199: result: ${cl_fixnum}" >&5
 echo "${ECHO_T}${cl_fixnum}" >&6
 cat >>confdefs.h <<EOF
 #define CL_FIXNUM_TYPE ${cl_fixnum}
@@ -3214,21 +3206,21 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:3217: error: There is no appropiate integer type for the cl_fixnum type" >&5
+{ { echo "$as_me:3209: error: There is no appropiate integer type for the cl_fixnum type" >&5
 echo "$as_me: error: There is no appropiate integer type for the cl_fixnum type" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3223: checking most positive fixnum" >&5
+echo "$as_me:3215: checking most positive fixnum" >&5
 echo $ECHO_N "checking most positive fixnum... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3226: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3218: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3231 "configure"
+#line 3223 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
@@ -3247,18 +3239,18 @@ int main() {
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3253: \$? = $ac_status" >&5
+  echo "$as_me:3245: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3258: \$? = $ac_status" >&5
+  echo "$as_me:3250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cl_fixnum_limit=`cat conftestval`
-echo "$as_me:3261: result: ${cl_fixnum_limit}" >&5
+echo "$as_me:3253: result: ${cl_fixnum_limit}" >&5
 echo "${ECHO_T}${cl_fixnum_limit}" >&6
 cat >>confdefs.h <<EOF
 #define MOST_POSITIVE_FIXNUM ${cl_fixnum_limit}
@@ -3268,14 +3260,14 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:3271: error: There is no appropiate integer type for the cl_fixnum type" >&5
+{ { echo "$as_me:3263: error: There is no appropiate integer type for the cl_fixnum type" >&5
 echo "$as_me: error: There is no appropiate integer type for the cl_fixnum type" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:3278: checking whether byte ordering is bigendian" >&5
+echo "$as_me:3270: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3283,7 +3275,7 @@ else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 3286 "configure"
+#line 3278 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3300,20 +3292,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3303: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3306: \$? = $ac_status" >&5
+  echo "$as_me:3298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3312: \$? = $ac_status" >&5
+  echo "$as_me:3304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 3316 "configure"
+#line 3308 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3330,16 +3322,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3336: \$? = $ac_status" >&5
+  echo "$as_me:3328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3342: \$? = $ac_status" >&5
+  echo "$as_me:3334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -3355,12 +3347,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:3358: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:3350: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3363 "configure"
+#line 3355 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -3376,15 +3368,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3382: \$? = $ac_status" >&5
+  echo "$as_me:3374: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3387: \$? = $ac_status" >&5
+  echo "$as_me:3379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -3397,7 +3389,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3400: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:3392: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -3408,7 +3400,7 @@ EOF
 fi
     	   # DEFS WORDS_BIGENDIAN
 
-echo "$as_me:3411: checking for X" >&5
+echo "$as_me:3403: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -3505,17 +3497,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3508 "configure"
+#line 3500 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:3512: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3504: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3518: \$? = $ac_status" >&5
+  echo "$as_me:3510: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3548,7 +3540,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 3551 "configure"
+#line 3543 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -3560,16 +3552,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3566: \$? = $ac_status" >&5
+  echo "$as_me:3558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3572: \$? = $ac_status" >&5
+  echo "$as_me:3564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -3607,7 +3599,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:3610: result: $have_x" >&5
+  echo "$as_me:3602: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -3617,7 +3609,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:3620: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:3612: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -3641,11 +3633,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:3644: checking whether -R must be followed by a space" >&5
+      echo "$as_me:3636: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 3648 "configure"
+#line 3640 "configure"
 #include "confdefs.h"
 
 int
@@ -3657,16 +3649,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3663: \$? = $ac_status" >&5
+  echo "$as_me:3655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3669: \$? = $ac_status" >&5
+  echo "$as_me:3661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -3676,13 +3668,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:3679: result: no" >&5
+	echo "$as_me:3671: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3685 "configure"
+#line 3677 "configure"
 #include "confdefs.h"
 
 int
@@ -3694,16 +3686,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3697: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3689: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3700: \$? = $ac_status" >&5
+  echo "$as_me:3692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3703: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3706: \$? = $ac_status" >&5
+  echo "$as_me:3698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -3713,11 +3705,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:3716: result: yes" >&5
+	  echo "$as_me:3708: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:3720: result: neither works" >&5
+	  echo "$as_me:3712: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -3737,7 +3729,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 3740 "configure"
+#line 3732 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3756,22 +3748,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3762: \$? = $ac_status" >&5
+  echo "$as_me:3754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3768: \$? = $ac_status" >&5
+  echo "$as_me:3760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:3774: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:3766: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3779,7 +3771,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3782 "configure"
+#line 3774 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3798,16 +3790,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3804: \$? = $ac_status" >&5
+  echo "$as_me:3796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3810: \$? = $ac_status" >&5
+  echo "$as_me:3802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -3818,14 +3810,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3821: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:3813: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:3828: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:3820: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3833,7 +3825,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3836 "configure"
+#line 3828 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3852,16 +3844,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3858: \$? = $ac_status" >&5
+  echo "$as_me:3850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3864: \$? = $ac_status" >&5
+  echo "$as_me:3856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -3872,7 +3864,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3875: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:3867: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -3891,13 +3883,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:3894: checking for gethostbyname" >&5
+    echo "$as_me:3886: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3900 "configure"
+#line 3892 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -3928,16 +3920,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3934: \$? = $ac_status" >&5
+  echo "$as_me:3926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3940: \$? = $ac_status" >&5
+  echo "$as_me:3932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -3947,11 +3939,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3950: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:3942: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:3954: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:3946: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3959,7 +3951,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3962 "configure"
+#line 3954 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3978,16 +3970,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3973: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3984: \$? = $ac_status" >&5
+  echo "$as_me:3976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3990: \$? = $ac_status" >&5
+  echo "$as_me:3982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -3998,14 +3990,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4001: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:3993: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:4008: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:4000: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4013,7 +4005,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4016 "configure"
+#line 4008 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4032,16 +4024,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4038: \$? = $ac_status" >&5
+  echo "$as_me:4030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4044: \$? = $ac_status" >&5
+  echo "$as_me:4036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -4052,7 +4044,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4055: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:4047: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -4068,13 +4060,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:4071: checking for connect" >&5
+    echo "$as_me:4063: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4077 "configure"
+#line 4069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -4105,16 +4097,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4111: \$? = $ac_status" >&5
+  echo "$as_me:4103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4117: \$? = $ac_status" >&5
+  echo "$as_me:4109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -4124,11 +4116,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4127: result: $ac_cv_func_connect" >&5
+echo "$as_me:4119: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:4131: checking for connect in -lsocket" >&5
+      echo "$as_me:4123: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4136,7 +4128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4139 "configure"
+#line 4131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4155,16 +4147,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4161: \$? = $ac_status" >&5
+  echo "$as_me:4153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4167: \$? = $ac_status" >&5
+  echo "$as_me:4159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -4175,7 +4167,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4178: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:4170: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -4184,13 +4176,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:4187: checking for remove" >&5
+    echo "$as_me:4179: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4193 "configure"
+#line 4185 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -4221,16 +4213,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4227: \$? = $ac_status" >&5
+  echo "$as_me:4219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4233: \$? = $ac_status" >&5
+  echo "$as_me:4225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -4240,11 +4232,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4243: result: $ac_cv_func_remove" >&5
+echo "$as_me:4235: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:4247: checking for remove in -lposix" >&5
+      echo "$as_me:4239: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4252,7 +4244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4255 "configure"
+#line 4247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4271,16 +4263,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4274: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4277: \$? = $ac_status" >&5
+  echo "$as_me:4269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4283: \$? = $ac_status" >&5
+  echo "$as_me:4275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -4291,7 +4283,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4294: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:4286: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -4300,13 +4292,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:4303: checking for shmat" >&5
+    echo "$as_me:4295: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4309 "configure"
+#line 4301 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -4337,16 +4329,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4332: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4343: \$? = $ac_status" >&5
+  echo "$as_me:4335: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4349: \$? = $ac_status" >&5
+  echo "$as_me:4341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -4356,11 +4348,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4359: result: $ac_cv_func_shmat" >&5
+echo "$as_me:4351: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:4363: checking for shmat in -lipc" >&5
+      echo "$as_me:4355: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4368,7 +4360,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4371 "configure"
+#line 4363 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4387,16 +4379,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4393: \$? = $ac_status" >&5
+  echo "$as_me:4385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4399: \$? = $ac_status" >&5
+  echo "$as_me:4391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -4407,7 +4399,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4410: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:4402: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -4425,7 +4417,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:4428: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:4420: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4433,7 +4425,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4436 "configure"
+#line 4428 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4452,16 +4444,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4458: \$? = $ac_status" >&5
+  echo "$as_me:4450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4464: \$? = $ac_status" >&5
+  echo "$as_me:4456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -4472,7 +4464,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4475: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:4467: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -4497,13 +4489,13 @@ fi
 
 XLIBS="$XLIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 
-echo "$as_me:4500: checking checking for gmp..." >&5
+echo "$as_me:4492: checking checking for gmp..." >&5
 echo $ECHO_N "checking checking for gmp...... $ECHO_C" >&6
 if test ${local_gmp} = "yes" ; then
-  echo "$as_me:4503: result: already installed" >&5
+  echo "$as_me:4495: result: already installed" >&5
 echo "${ECHO_T}already installed" >&6
 else
-  echo "$as_me:4506: result: configuring local copy" >&5
+  echo "$as_me:4498: result: configuring local copy" >&5
 echo "${ECHO_T}configuring local copy" >&6
   test -d gmp && rm -rf gmp
   if mkdir gmp; then
@@ -4513,13 +4505,13 @@ echo "${ECHO_T}configuring local copy" >&6
         --libdir=${builddir} $gmp_flags)
   fi
 fi
-echo "$as_me:4516: checking checking for Boehm-Weiser gc..." >&5
+echo "$as_me:4508: checking checking for Boehm-Weiser gc..." >&5
 echo $ECHO_N "checking checking for Boehm-Weiser gc...... $ECHO_C" >&6
 if test ${boehm} = "no"; then
-  echo "$as_me:4519: result: use small collector instead" >&5
+  echo "$as_me:4511: result: use small collector instead" >&5
 echo "${ECHO_T}use small collector instead" >&6
 elif test "${local_boehm}" = "no" ; then
-  echo "$as_me:4522: result: configuring local copy" >&5
+  echo "$as_me:4514: result: configuring local copy" >&5
 echo "${ECHO_T}configuring local copy" >&6
   test -d gc && rm -rf gc
   if mkdir gc; then
@@ -4528,7 +4520,7 @@ echo "${ECHO_T}configuring local copy" >&6
 	--includedir=${builddir}/h --libdir=${builddir})
   fi
 else
-  echo "$as_me:4531: result: already installed" >&5
+  echo "$as_me:4523: result: already installed" >&5
 echo "${ECHO_T}already installed" >&6
 fi
 ac_config_files="$ac_config_files compile.lsp compile_rest.lsp bare.lsp lsp/config.lsp cmp/cmpcfg.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp ../Makefile Makefile c/Makefile doc/Makefile tk/Makefile clx/defsys.lsp tests/Makefile ansi-tests/Makefile gabriel/Makefile lsp/defsys.lsp cmp/defsys.lsp clos/defsys.lsp"
@@ -4611,7 +4603,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:4614: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:4606: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -4784,7 +4776,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:4787: error: ambiguous option: $1
+    { { echo "$as_me:4779: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4803,7 +4795,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:4806: error: unrecognized option: $1
+  -*) { { echo "$as_me:4798: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4859,7 +4851,7 @@ do
   "cmp/defsys.lsp" ) CONFIG_FILES="$CONFIG_FILES cmp/defsys.lsp" ;;
   "clos/defsys.lsp" ) CONFIG_FILES="$CONFIG_FILES clos/defsys.lsp" ;;
   "h/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS h/config.h" ;;
-  *) { { echo "$as_me:4862: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:4854: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5113,7 +5105,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:5116: creating $ac_file" >&5
+    { echo "$as_me:5108: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -5131,7 +5123,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5134: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5126: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5144,7 +5136,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5147: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5139: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5205,7 +5197,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:5208: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:5200: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -5216,7 +5208,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5219: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5211: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5229,7 +5221,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5232: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5224: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5346,7 +5338,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:5349: $ac_file is unchanged" >&5
+      { echo "$as_me:5341: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/src/configure.in b/src/configure.in
index 0f031cb62..4f66859a9 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -53,9 +53,9 @@ dnl 	clx="$enableval")
 AC_ARG_WITH(tcp,
 	[--with-tcp             Include socket interface.],
 	tcp="yes")
-AC_ARG_ENABLE(boehm,
-	[--disable-boehm        Disable Boehm's garbage collector.],
-	boehm="${enableval}",boehm="yes")
+dnl AC_ARG_ENABLE(boehm,
+dnl	[--disable-boehm        Disable Boehm's garbage collector.],
+dnl	boehm="${enableval}",boehm="yes")
 AC_ARG_ENABLE(local-boehm,
 	[--enable-local-boehm   Use already installed Boehm GC library.],
 	[local_boehm="${enableval}" boehm="yes"],local_boehm="no")
diff --git a/src/h/external.h b/src/h/external.h
index bbdae1ff4..93c14dea8 100644
--- a/src/h/external.h
+++ b/src/h/external.h
@@ -39,7 +39,16 @@ extern void init_all_functions(void);
 
 
 /* all_symbols */
-extern struct symbol cl_symbols[];
+typedef union {
+	struct {
+		const char *name;
+		int type;
+		cl_object *loc;
+	} init;
+	struct symbol data;
+} cl_symbol_initializer;
+extern cl_symbol_initializer cl_symbols[];
+extern cl_index cl_num_symbols_in_core;
 extern void init_all_symbols(void);
 
 
diff --git a/src/h/internal.h b/src/h/internal.h
index 6310be26c..23d56c0de 100644
--- a/src/h/internal.h
+++ b/src/h/internal.h
@@ -16,6 +16,10 @@
 extern "C" {
 #endif
 
+/* all_symbols.d */
+
+extern cl_index cl_num_symbols_in_core;
+
 /* all_functions.d */
 
 extern const struct {
diff --git a/src/h/lisp_external.h b/src/h/lisp_external.h
index a90a5999e..7b29663c2 100644
--- a/src/h/lisp_external.h
+++ b/src/h/lisp_external.h
@@ -10,13 +10,12 @@ extern "C" {
 
 #if !defined(GBC_BOEHM)
 extern cl_object siLallocate _ARGS((int narg, cl_object type, cl_object qty, ...));
-extern cl_object siLmaxpage _ARGS((int narg, cl_object type));
+extern cl_object siLmaximum_allocatable_pages _ARGS((int narg, cl_object type));
 extern cl_object siLallocated_pages _ARGS((int narg, cl_object type));
 extern cl_object siLalloc_contpage _ARGS((int narg, cl_object qty, ...));
-extern cl_object siLncbpage _ARGS((int narg));
-extern cl_object siLmaxcbpage _ARGS((int narg));
-extern cl_object siLalloc_relpage _ARGS((int narg, cl_object qty, cl_object now));
-extern cl_object siLnrbpage _ARGS((int narg));
+extern cl_object siLallocated_contiguous_pages _ARGS((int narg));
+extern cl_object siLmaximum_contiguous_pages _ARGS((int narg));
+extern cl_object siLallocate_contiguous_pages _ARGS((int narg, cl_object qty, ...));
 extern cl_object siLget_hole_size _ARGS((int narg));
 extern cl_object siLset_hole_size _ARGS((int narg, cl_object size));
 extern cl_object siLignore_maximum_pages _ARGS((int narg, ...));
diff --git a/src/lsp/export.lsp b/src/lsp/export.lsp
index 519716073..87de2aec8 100644
--- a/src/lsp/export.lsp
+++ b/src/lsp/export.lsp
@@ -318,7 +318,6 @@
 		`(si::fset ',name ,function))))
 	  t)
 
-
 (si::fset 'in-package
 	  #'(lambda-block in-package (def env)
 	      `(si::select-package ,(string (second def))))