Merge branch 'master' into boehm-demers-weiser-gc

Conflicts:
	lib/Makefile.am
	libguile/gc-card.c
	libguile/gc-freelist.c
	libguile/gc-mark.c
	libguile/gc-segment.c
	libguile/gc.c
	libguile/gc.h
	libguile/gc_os_dep.c
	libguile/private-gc.h
	m4/.cvsignore
	m4/gnulib-cache.m4
	m4/gnulib-comp.m4

diff --cc lib/Makefile.am
index bc994f6,9196064..5b92d3d
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -9,7 -9,7 +9,7 @@@
  # the same distribution terms as the rest of that program.
  #
  # Generated by gnulib-tool.
- # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca extensions strcase strftime
 -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild count-one-bits extensions strcase strftime
++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild extensions strcase strftime
  
  AUTOMAKE_OPTIONS = 1.5 gnits
  

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/arbiters.c
Simple merge

diff --cc libguile/async.c
Simple merge

diff --cc libguile/continuations.c
Simple merge

diff --cc libguile/coop.c
Simple merge

diff --cc libguile/debug.c
Simple merge

diff --cc libguile/dynl.c
Simple merge

diff --cc libguile/dynwind.c
Simple merge

diff --cc libguile/environments.c
Simple merge

diff --cc libguile/eval.c
Simple merge

diff --cc libguile/fluids.c
Simple merge

diff --cc libguile/fports.c
Simple merge

diff --cc libguile/futures.c
Simple merge

diff --cc libguile/gc-malloc.c
Simple merge

diff --cc libguile/gc.c
Simple merge

diff --cc libguile/gdbint.c
Simple merge

diff --cc libguile/goops.c
Simple merge

diff --cc libguile/guardians.c
index 879462a,e2af784..43edf81
--- 1/libguile/guardians.c
--- 2/libguile/guardians.c
+++ b/libguile/guardians.c
@@@ -36,11 -37,11 +36,14 @@@
   * Now they should again behave like those described in the paper.
   * Scheme guardians should be simple and friendly, not like the greedy
   * monsters we had...
 + *
 + * Rewritten for the Boehm-Wiser GC by Ludovic Courtès.
 + * FIXME: This is currently not thread-safe.
   */
  
+ #ifdef HAVE_CONFIG_H
+ # include <config.h>
+ #endif
  
  #include "libguile/_scm.h"
  #include "libguile/async.h"

diff --cc libguile/hashtab.c
Simple merge

diff --cc libguile/hooks.c
Simple merge

diff --cc libguile/init.c
Simple merge

diff --cc libguile/keywords.c
Simple merge

diff --cc libguile/macros.c
Simple merge

diff --cc libguile/mallocs.c
Simple merge

diff --cc libguile/modules.c
Simple merge

diff --cc libguile/numbers.c
Simple merge

diff --cc libguile/objects.c
Simple merge

diff --cc libguile/ports.c
Simple merge

diff --cc libguile/print.c
Simple merge

diff --cc libguile/procs.c
Simple merge

diff --cc libguile/random.c
Simple merge

diff --cc libguile/regex-posix.c
Simple merge

diff --cc libguile/smob.c
Simple merge

diff --cc libguile/srcprop.c
Simple merge

diff --cc libguile/srfi-4.c
Simple merge

diff --cc libguile/strings.c
Simple merge

diff --cc libguile/struct.c
Simple merge

diff --cc libguile/symbols.c
Simple merge

diff --cc libguile/threads.c
index 8ffefae,72af3d1..b1cbba2
--- 1/libguile/threads.c
--- 2/libguile/threads.c
+++ b/libguile/threads.c
@@@ -17,12 -17,10 +17,15 @@@
  
  
  \f
+ #ifdef HAVE_CONFIG_H
+ # include <config.h>
+ #endif
  
 +#if HAVE_CONFIG_H
 +# include <config.h>
 +#endif
 +
 +#include "libguile/boehm-gc.h"
  #include "libguile/_scm.h"
  
  #if HAVE_UNISTD_H

diff --cc libguile/unif.c
Simple merge

diff --cc libguile/vectors.c
Simple merge

diff --cc libguile/weaks.c
Simple merge

diff --cc m4/gnulib-cache.m4
index 11af0bc,ac9319a..0de0cb4
--- 1/m4/gnulib-cache.m4
--- 2/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@@ -15,12 -15,14 +15,13 @@@
  
  
  # Specification in the form of a command-line invocation:
- #   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca extensions strcase strftime
 -#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild count-one-bits extensions strcase strftime
++#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild extensions strcase strftime
  
  # Specification in the form of a few gnulib-tool.m4 macro invocations:
  gl_LOCAL_DIR([])
  gl_MODULES([
    alloca
 -  count-one-bits
+   autobuild
    extensions
    strcase
    strftime

diff --cc m4/gnulib-comp.m4
index 614e07a,14f312b..012ee10
--- 1/m4/gnulib-comp.m4
--- 2/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@@ -193,8 -197,11 +194,9 @@@ AC_DEFUN([gl_FILE_LIST], 
    lib/strncasecmp.c
    lib/time.in.h
    lib/time_r.c
 -  lib/verify.h
    lib/wchar.in.h
    m4/alloca.m4
 -  m4/count-one-bits.m4
+   m4/autobuild.m4
    m4/extensions.m4
    m4/gnulib-common.m4
    m4/include_next.m4

diff --cc test-suite/Makefile.am
Simple merge