Merge branch 'master' into pucked.

diff --cc src/blowfish/Makefile.am
Simple merge

diff --cc src/blowfish/configure.ac
Simple merge

diff --cc src/gdbm/Makefile.am
Simple merge

diff --cc src/imail/Makefile.am
index 62d4bf9cf131c04f717d915f90463dd885808c1e,6da398fa185b461b97367d15a3fc840c2a37548a..2dba8484353c905aca62f4be31bb5480abcaf063
--- 1/src/imail/Makefile.am
--- 2/src/imail/Makefile.am
+++ b/src/imail/Makefile.am
@@@ -48,13 -47,12 +48,14 @@@ binaries += imail-util.bci imail-util.c
  binaries += imap-response.bci imap-response.com
  binaries += imap-syntax.bci imap-syntax.com
  
- scmlib_sub_DATA = $(sources) $(binaries)
+ scmlib_sub_DATA = $(sources)
+ scmlib_sub_DATA += $(binaries)
  scmlib_sub_DATA += make.scm imail.pkg @MIT_SCHEME_PKD@
  
 -info_TEXINFOS = mit-scheme-imail.texi
 -AM_MAKEINFOHTMLFLAGS = --no-split
 +scminfo_DATA = imail.info
 +info_TEXINFOS = imail.texi
 +AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=style.css
 +AM_UPDATE_INFO_DIR = no
  
  imail-browser.bci: stamp-scheme
  imail-browser.com: stamp-scheme
@@@ -92,15 -90,9 +93,14 @@@ CLEANFILES += stamp-schem
  
  TAGS_FILES = $(sources)
  
- EXTRA_DIST += $(sources) compile.sh compile.scm imail.pkg
- EXTRA_DIST += make.scm debian
 -EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg
++EXTRA_DIST += $(sources) compile.sh make.scm compile.scm imail.pkg debian
  
  install-data-hook:
 +      ( echo '(add-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
 +        echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +        echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +      | $(MIT_SCHEME_EXE) --batch-mode
  
  install-html: install-html-am
        ( echo '(add-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \

diff --cc src/mcrypt/Makefile.am
Simple merge

diff --cc src/pgsql/Makefile.am
index b397b63c469db81a0c3aa9ed5ff8ef0869d94874,9f0bfb7e2be56a5a6c370d31e06fde13c187380c..bda6f42c03a722eed635cb5cf86240a6a9335426
--- 1/src/pgsql/Makefile.am
--- 2/src/pgsql/Makefile.am
+++ b/src/pgsql/Makefile.am
@@@ -52,9 -49,7 +52,9 @@@ AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR
  AM_CFLAGS = @MIT_CFLAGS@ `pkg-config --cflags libpq`
  AM_LIBS = `pkg-config --libs libpq`
  
- pgsql_shim_la_LDFLAGS = -module -avoid-version -shared
 +pgsql_shim_la_SOURCES = pgsql-shim.h
 +nodist_pgsql_shim_la_SOURCES = pgsql-shim.c
+ pgsql_shim_la_LDFLAGS = -module -avoid-version -shared
  
  noinst_PROGRAMS = pgsql-const$(EXEEXT)
  pgsql_const_SOURCES = pgsql-shim.h
@@@ -96,9 -91,10 +96,10 @@@ tags: tags-am $(sources) $(cdecls
        $(ETAGS) -a $(sources) -r '/^([^iI].*/' $(cdecls)
        ./tags-fix.sh
  
- EXTRA_DIST += $(sources) $(cdecls) compile.sh compile.scm pgsql.pkg
+ EXTRA_DIST += $(sources) $(cdecls)
+ EXTRA_DIST += compile.sh compile.scm pgsql.pkg
  EXTRA_DIST += pgsql-check.scm pgsql-check.sh
 -EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 +EXTRA_DIST += make.scm optiondb.scm tags-fix.sh debian
  
  install-data-hook:
        ( echo '(add-plugin "pgsql" "@MIT_SCHEME_PROJECT@"'; \

diff --cc src/x11/Makefile.am
Simple merge