Merge branch 'master' into Gtk.

diff --cc src/blowfish/Makefile.am
index fff568fa0d6c37780836119fed3b8c66e5a1739e,f6b4ddec5e54d28d1b8720832513433e6864c8db..da8a9735112b30212369eadc943b6d763d9c4ad7
--- 1/src/blowfish/Makefile.am
--- 2/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  blowfish_shim_la_LIBADD = blowfish-adapter.lo
  blowfish_shim_la_LDFLAGS = -module -avoid-version -shared

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

diff --cc src/gdbm/Makefile.am
index 91969d7e19e09e9d1ea4a83d34ad4481c90694f4,332e648603508b1eccbe8786f1e27bef34b9e9b5..e0f5031e1bc3817a2b87f4497059bca7afefad74
--- 1/src/gdbm/Makefile.am
--- 2/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  gdbm_shim_la_LIBADD = gdbm-adapter.lo
  gdbm_shim_la_LDFLAGS = -module -avoid-version -shared

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

diff --cc src/mcrypt/Makefile.am
index e986041fc643e523adc35d977deb27c57d011b42,9bbc0225ac8c8b15c26ff678e38406be5da10a91..50a311d5bc54d0e928edb10481981cc1072a916e
--- 1/src/mcrypt/Makefile.am
--- 2/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  mcrypt_shim_la_LIBADD = mcrypt-adapter.lo
  mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared

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

diff --cc src/md5/Makefile.am
index d6152ac6f7bf40819c278f9b7210bc3034d2639f,15d6c0493f74f0421aa2496732b891e1d0032455..bc0f8907c5c2eff983a5ef8ec6db1209861a61e4
--- 1/src/md5/Makefile.am
--- 2/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  md5_shim_la_LIBADD = md5-adapter.lo
  md5_shim_la_LDFLAGS = -module -avoid-version -shared

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

diff --cc src/mhash/Makefile.am
index 427a5f7a3abaffe304ab95e6d1525cd678e01c7f,9dd3dd3f369455d390e80f701e0065626f4c0f8a..a7158f09f7e635949df498095f68df79d6eaacd8
--- 1/src/mhash/Makefile.am
--- 2/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  mhash_shim_la_LIBADD = mhash-adapter.lo
  mhash_shim_la_LDFLAGS = -module -avoid-version -shared

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

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

diff --cc src/x11-screen/configure.ac
index 6bd367b4ca7c505bf68b8e43ed6d67ec097a7b30,57ce704e445cfaf4c1eb6092cdf57a293cf476aa..5e01a90f831382e99a2ab7372f4e26db90ac83e0
--- 1/src/x11-screen/configure.ac
--- 2/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@@ -45,13 -45,10 +45,10 @@@ os_suffix=`echo "(display (microcode-id
  
  MIT_SCHEME_PKD="x11-screen-${os_suffix}.pkd"
  
 -for f in x11-screen; do       # x11-key x11-command
 +for f in x11-screen x11-key x11-command; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
-     MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
      MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
      MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
- ${f}.bin: stamp-scheme"
-     MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
  ${f}.bci: stamp-scheme"
      if test "$cc_type" = "c"; then
        MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"

diff --cc src/x11/Makefile.am
index 815f7b9416d7e5a08a89b254567cb9a877754f39,e4216c6f3604060a88bc4e9bf1988d725dcdcd3a..ba8df27ae755a64ad46b4ae812953338d5e675cf
--- 1/src/x11/Makefile.am
--- 2/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@@ -45,12 -45,13 +45,13 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
- AM_CFLAGS = `pkg-config --cflags x11`
+ AM_CFLAGS = @MIT_CFLAGS@
+ AM_CFLAGS += `pkg-config --cflags x11`
  LIBS = `pkg-config --libs x11`
  
  x11_shim_la_LIBADD = x11base.lo x11color.lo x11graph.lo x11term.lo

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