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

Conflicts:
	lib/Makefile.am
	m4/gnulib-cache.m4
	m4/gnulib-comp.m4

diff --cc configure.in
Simple merge

diff --cc lib/Makefile.am
index 5070207,309e941..bd59069
--- 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 --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild extensions full-read full-write strcase strftime
 -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions full-read full-write strcase strftime
++# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild extensions full-read full-write strcase strftime
  
  AUTOMAKE_OPTIONS = 1.5 gnits
  
@@@ -64,6 -53,69 +53,62 @@@ EXTRA_DIST += alloca.in.
  
  ## end   gnulib module alloca-opt
  
 -## begin gnulib module count-one-bits
 -
 -
 -EXTRA_DIST += count-one-bits.h
 -
 -## end   gnulib module count-one-bits
 -
+ ## begin gnulib module configmake
+ 
+ # Retrieve values of the variables through 'configure' followed by
+ # 'make', not directly through 'configure', so that a user who
+ # sets some of these variables consistently on the 'make' command
+ # line gets correct results.
+ #
+ # One advantage of this approach, compared to the classical
+ # approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+ # is that it protects against the use of undefined variables.
+ # If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+ # defined by this module, and code using LIBDIR gives a
+ # compilation error.
+ #
+ # Another advantage is that 'make' output is shorter.
+ #
+ # Listed in the same order as the GNU makefile conventions.
+ # The Automake-defined pkg* macros are appended, in the order
+ # listed in the Automake 1.10a+ documentation.
+ configmake.h: Makefile
+       rm -f $@-t $@
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         echo '#define PREFIX "$(prefix)"'; \
+         echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+         echo '#define BINDIR "$(bindir)"'; \
+         echo '#define SBINDIR "$(sbindir)"'; \
+         echo '#define LIBEXECDIR "$(libexecdir)"'; \
+         echo '#define DATAROOTDIR "$(datarootdir)"'; \
+         echo '#define DATADIR "$(datadir)"'; \
+         echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+         echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+         echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+         echo '#define INCLUDEDIR "$(includedir)"'; \
+         echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+         echo '#define DOCDIR "$(docdir)"'; \
+         echo '#define INFODIR "$(infodir)"'; \
+         echo '#define HTMLDIR "$(htmldir)"'; \
+         echo '#define DVIDIR "$(dvidir)"'; \
+         echo '#define PDFDIR "$(pdfdir)"'; \
+         echo '#define PSDIR "$(psdir)"'; \
+         echo '#define LIBDIR "$(libdir)"'; \
+         echo '#define LISPDIR "$(lispdir)"'; \
+         echo '#define LOCALEDIR "$(localedir)"'; \
+         echo '#define MANDIR "$(mandir)"'; \
+         echo '#define MANEXT "$(manext)"'; \
+         echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+         echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+         echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+         echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+       } | sed '/""/d' > $@-t
+       mv $@-t $@
+ BUILT_SOURCES += configmake.h
+ CLEANFILES += configmake.h configmake.h-t
+ 
+ ## end   gnulib module configmake
+ 
  ## begin gnulib module full-read
  
  libgnu_la_SOURCES += full-read.h full-read.c

diff --cc libguile/goops.c
Simple merge

diff --cc m4/gnulib-cache.m4
index 825363f,5781d1d..2986b3c
--- 1/m4/gnulib-cache.m4
--- 2/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@@ -15,13 -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 --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl alloca autobuild extensions full-read full-write strcase strftime
 -#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions full-read full-write strcase strftime
++#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild extensions full-read full-write strcase strftime
  
  # Specification in the form of a few gnulib-tool.m4 macro invocations:
  gl_LOCAL_DIR([])
  gl_MODULES([
-   alloca
+   alloca-opt
    autobuild
 -  count-one-bits
    extensions
    full-read
    full-write

diff --cc m4/gnulib-comp.m4
index 1e4010f,5e9ce99..327cdd0
--- 1/m4/gnulib-comp.m4
--- 2/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@@ -42,11 -42,18 +42,16 @@@ AC_DEFUN([gl_INIT]
    m4_pushdef([gl_LIBSOURCES_DIR], [])
    gl_COMMON
    gl_source_base='lib'
- changequote(,)dnl
- LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
- changequote([, ])dnl
- AC_SUBST([LTALLOCA])
    gl_FUNC_ALLOCA
 -  gl_COUNT_ONE_BITS
 -  gl_INLINE
+   gl_LOCALCHARSET
+   LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
+   gl_FUNC_MBRLEN
+   gl_WCHAR_MODULE_INDICATOR([mbrlen])
+   gl_FUNC_MBRTOWC
+   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
+   gl_FUNC_MBSINIT
+   gl_WCHAR_MODULE_INDICATOR([mbsinit])
    gl_SAFE_READ
    gl_SAFE_WRITE
    gt_TYPE_SSIZE_T
@@@ -189,8 -196,9 +194,8 @@@ AC_DEFUN([gltests_LIBSOURCES], 
  # gnulib-tool and may be removed by future gnulib-tool invocations.
  AC_DEFUN([gl_FILE_LIST], [
    build-aux/link-warning.h
-   lib/alloca.c
    lib/alloca.in.h
 -  lib/count-one-bits.h
+   lib/config.charset
    lib/full-read.c
    lib/full-read.h
    lib/full-write.c
@@@ -213,9 -229,20 +226,18 @@@
    lib/write.c
    m4/alloca.m4
    m4/autobuild.m4
 -  m4/count-one-bits.m4
+   m4/codeset.m4
    m4/extensions.m4
+   m4/glibc21.m4
    m4/gnulib-common.m4
    m4/include_next.m4
 -  m4/inline.m4
+   m4/localcharset.m4
+   m4/locale-fr.m4
+   m4/locale-ja.m4
+   m4/locale-zh.m4
+   m4/mbrlen.m4
+   m4/mbrtowc.m4
+   m4/mbsinit.m4
    m4/mbstate_t.m4
    m4/safe-read.m4
    m4/safe-write.m4