From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 13 Sep 2008 20:51:27 +0000 (+0200)
Subject: Merge branch 'master' into boehm-demers-weiser-gc
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/44e268898b522dd1c15e968d68adcb2f6fe12359

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
---

44e268898b522dd1c15e968d68adcb2f6fe12359
diff --cc lib/Makefile.am
index bc994f6e5,9196064cc..5b92d3d7e
--- a/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/guardians.c
index 879462a73,e2af7840d..43edf818d
--- a/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/threads.c
index 8ffefae2e,72af3d17f..b1cbba260
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@@ -17,12 -17,10 +17,15 @@@
  
  
  
+ #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 m4/gnulib-cache.m4
index 11af0bc4d,ac9319a89..0de0cb4d5
--- a/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
+   autobuild
 -  count-one-bits
    extensions
    strcase
    strftime
diff --cc m4/gnulib-comp.m4
index 614e07a06,14f312bc7..012ee10ea
--- a/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/autobuild.m4
 -  m4/count-one-bits.m4
    m4/extensions.m4
    m4/gnulib-common.m4
    m4/include_next.m4