Merge commit 'origin/master' into vm

Conflicts:

	doc/Makefile.am
	ice-9/Makefile.am
	libguile/gc.c

diff --cc Makefile.am
Simple merge

diff --cc configure.in
Simple merge

diff --cc doc/Makefile.am
index 8543b05,599af2b..331a468
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -48,6 -47,4 +47,5 @@@ include $(top_srcdir)/am/maintainer-dir
  guile-api.alist: guile-api.alist-FORCE
        ( cd $(top_builddir) ; $(mscripts)/update-guile-api.alist )
  guile-api.alist-FORCE:
- endif
  
 +info_TEXINFOS = guile-vm.texi

diff --cc ice-9/Makefile.am
index cdb3ef8,22299c1..e145486
--- 1/ice-9/Makefile.am
--- 2/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@@ -41,37 -35,24 +41,35 @@@ SOURCES = psyntax-pp.scm boot-9.scm 
        safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm     \
        streams.scm string-fun.scm syncase.scm threads.scm              \
        buffered-input.scm time.scm history.scm channel.scm             \
 -        pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm     \
 +        pretty-print.scm ftw.scm gap-buffer.scm                               \
        weak-vector.scm deprecated.scm list.scm serialize.scm           \
 -      gds-client.scm gds-server.scm
 +      gds-server.scm
  
 -subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/ice-9
 -subpkgdata_DATA = $(ice9_sources)
 -TAGS_FILES = $(subpkgdata_DATA)
 +# match.scm compiles, but then using it (via
 +# snarf-check-and-output-texi) fails. need to figure out what the
 +# problem is.
 +# 
 +# occam-channel and gds-client use goops, which is not yet vm-compatible
 +# (it does some compilation-like optimizations for the interpreter), so
 +# punt on them for the time being.
 +#
 +# psyntax.scm needs help. fortunately it's only needed when recompiling
 +# psyntax-pp.scm.
 +NOCOMP_SOURCES = match.scm occam-channel.scm gds-client.scm psyntax.scm
 +
 +include $(top_srcdir)/guilec.mk
  
  ## test.scm is not currently installed.
- EXTRA_DIST += test.scm compile-psyntax.scm
 -EXTRA_DIST = $(ice9_sources) test.scm compile-psyntax.scm ChangeLog-2008
++EXTRA_DIST += test.scm compile-psyntax.scm ChangeLog-2008
 +
 +TAGS_FILES = $(SOURCES)
  
- if MAINTAINER_MODE
  # We expect this to never be invoked when there is not already
 -# ice-9/psyntax.pp in %load-path, since compile-psyntax.scm depends
 -# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax.pp")'.
 +# ice-9/psyntax-pp.scm in %load-path, since compile-psyntax.scm depends
 +# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax-pp.scm")'.
  # In other words, to bootstrap this file, you need to do something like:
 -#    GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax.pp
 +#    GUILE_LOAD_PATH=/usr/local/share/guile/1.5.4 make psyntax-pp.scm
  include $(top_srcdir)/am/pre-inst-guile
 -psyntax.pp: psyntax.ss
 +psyntax-pp.scm: psyntax.scm
        $(preinstguile) -s $(srcdir)/compile-psyntax.scm \
 -              $(srcdir)/psyntax.ss $(srcdir)/psyntax.pp
 -
 +              $(srcdir)/psyntax.scm $(srcdir)/psyntax-pp.scm
- endif

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/continuations.c
Simple merge

diff --cc libguile/debug.c
Simple merge

diff --cc libguile/eval.c
Simple merge

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

diff --cc libguile/init.c
Simple merge

diff --cc libguile/load.c
Simple merge

diff --cc libguile/macros.c
Simple merge

diff --cc libguile/modules.c
Simple merge

diff --cc libguile/procs.c
Simple merge

diff --cc scripts/Makefile.am
Simple merge