Merge branch 'master' into pucked.

diff --cc src/runtime/runtime.pkg
Simple merge

diff --cc src/x11-screen/x11-screen.pkg
Simple merge

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

diff --cc src/x11/configure.ac
index e25ff2b05651bc3e3d117e07f894fbd4e2cc03fc,6260f43efcb17a4b6a10a9365c5fe78577adc31e..e34ef0e486f0eadcb6ad0970977b78dc473cda3b
--- 1/src/x11/configure.ac
--- 2/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@@ -76,13 -75,29 +79,29 @@@ if test ${GCC} = yes; the
        [AC_MSG_RESULT([no])])
  fi
  
+ AC_PATH_X
  AC_CHECK_PROG([PKG_CONFIG], [pkg-config], [yes])
  
- if ! pkg-config --exists x11 2>/dev/null; then
-     AC_MSG_ERROR([X11 not found.])
+ AC_CHECK_HEADERS([malloc.h])
+ 
+ 
+ dnl Add support for X if present.
+ if test "${no_x}" != yes; then
+     if test "x${x_includes}" != x; then
+         FOO=-I`echo ${x_includes} | sed -e "s/:/ -I/g"`
+         MIT_CFLAGS="${MIT_CFLAGS} ${FOO}"
+     elif pkg-config --exists x11 2>/dev/null; then
+         MIT_CFLAGS="${MIT_CFLAGS} `pkg-config --cflags x11`"
+     fi
+     if test "x${x_libraries}" != x; then
+         FOO=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+         MIT_LIBS="${MIT_LIBS} ${FOO}"
+     elif pkg-config --exists x11 2>/dev/null; then
+         MIT_LIBS="${MIT_LIBS} `pkg-config --libs x11`"
+     fi
  fi
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
  : ${MIT_SCHEME_EXE=mit-scheme}
  MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
@@@ -119,11 -134,8 +138,12 @@@ don
  MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
  ${MIT_SCHEME_PKD}: stamp-scheme"
  
 +# Install plugin docs in Scheme's docdir subdirectories.
 +htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html'
 +pdfdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/pdf'
 +
  AC_SUBST([MIT_CFLAGS])
+ AC_SUBST([MIT_LIBS])
  AC_SUBST([MIT_SCHEME_PROJECT])
  AC_SUBST([MIT_SCHEME_EXE])
  AC_SUBST([MIT_SCHEME_LIBDIR])