Merge branch 'master' into Gtk.

diff --cc src/Makefile.in
index 90da94245841377d091cfc8aad6a0e0dcdbd8ba2,4ce49f754eb96d0d71a3a06ac5522d434f74ef5d..ffafd55f44f380d63d8391e5d2f25fbeb5d3fb10
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -62,10 -62,9 +62,9 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
  LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml
- FFIS = @FFIS@
  
 -SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
 +SUBDIRS = $(INSTALLED_SUBDIRS) 6001 rcs win32 xdoc
- INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) $(FFIS)
+ INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
  
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@

diff --cc src/README.txt
Simple merge

diff --cc src/configure.ac
index eb830d5500b4ed6465a30825074ce9098672f8ce,601a4bd9a2cad374c79a0403925e5f227fe51779..c2ad66a9fef59767719fd2053adcf0f339dca80b
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -155,25 -149,8 +155,24 @@@ directory, which is usually \`/usr/loca
      fi
  fi
  
 +AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
 +AC_MSG_CHECKING([for gtk])
 +if test "${with_gtk}" = "yes"; then
 +    AC_MSG_RESULT([by request... yes])
 +elif test "${with_gtk}" = "no"; then
 +    AC_MSG_RESULT([by request... no])
 +elif test "${with_gtk}" = "auto"; then
 +    if pkg-config --exists gtk+-3.0 2>/dev/null; then
 +      AC_MSG_RESULT([yes])
 +      with_gtk=yes
 +    else
 +      AC_MSG_RESULT([no Gtk 3.0... no])
 +      with_gtk=no
 +    fi
 +fi
 +
  AC_SUBST([DEFAULT_TARGET])
  AC_SUBST([ALL_TARGET])
- AC_SUBST([FFIS])
  AC_SUBST([INSTALL_COM])
  AC_SUBST([INSTALL_LIARC_BUNDLES])
  AC_SUBST([MIT_SCHEME_EXE])

diff --cc src/runtime/ffi.scm
Simple merge