Merge branch 'master' into ELisp.

diff --cc src/README.txt
Simple merge

diff --cc src/Setup.sh
index e8f43793027d4091d10c09ab22844a35dd10b27a,cd75b2ed71ce58be6f5003798e3eaadf3106b0fa..be58b94cb6360f5fbfa3e2e1f24aad0afd962565
--- 1/src/Setup.sh
--- 2/src/Setup.sh
+++ b/src/Setup.sh
@@@ -80,17 -80,21 +80,22 @@@ OTHER_SUBDIRS="6001 compiler rcs runtim
  
  # lib
  maybe_mkdir lib
- maybe_link lib/edwin ../edwin
  maybe_link lib/include ../microcode
+ maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
++maybe_link lib/shim-config.scm ../microcode/shim-config.scm
  maybe_link lib/optiondb.scm ../etc/optiondb.scm
- maybe_link lib/runtime ../runtime
+ 
  maybe_link lib/compiler ../compiler
- maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
- maybe_link lib/elisp ../elisp
+ maybe_link lib/cref ../cref
+ maybe_link lib/edwin ../edwin
  maybe_link lib/ffi ../ffi
- maybe_link lib/ffi-test-shim.so ../ffi/ffi-test-shim.so
- maybe_link lib/ffi-test-types.bin ../ffi/ffi-test-types.bin
- maybe_link lib/ffi-test-const.bin ../ffi/ffi-test-const.bin
+ maybe_link lib/imail ../imail
+ maybe_link lib/runtime ../runtime
+ maybe_link lib/sf ../sf
+ maybe_link lib/sos ../sos
+ maybe_link lib/ssp ../ssp
+ maybe_link lib/star-parser ../star-parser
+ maybe_link lib/xml ../xml
  
  maybe_link config.sub microcode/config.sub
  maybe_link config.guess microcode/config.guess

diff --cc src/etc/compile.scm
index 764511c3a97acdc53d00f62d56b4a8a6108973a1,f5eca8a4045e3e612271c0404bab84e031790d1f..38dc27c0b579720f47d86c287fecdc8bb64c9301
--- 1/src/etc/compile.scm
--- 2/src/etc/compile.scm
+++ b/src/etc/compile.scm
@@@ -41,20 -41,8 +41,8 @@@ USA
    (with-working-directory-pathname "sos"
      (lambda ()
        (load "load")))
 -  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi")))
 +  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi" "elisp")))
  
- (define (compile-ffi dir)
-   (if (eq? microcode-id/compiled-code-type 'C)
-       (in-liarc
-        (lambda ()
-        (c-compile-dir dir)
-        (let* ((line '("make" "compile-liarc-bundle"))
-               (code (run-synchronous-subprocess
-                      (car line) (cdr line) 'working-directory dir)))
-          (if (not (zero? code))
-              (error "Process exited with error code:" code line)))))
-       (compile-dir dir)))
- 
  (define (compile-boot-dirs compile-dir)
    (compile-cref compile-dir)
    (for-each compile-dir '("runtime" "cref" "sf" "compiler" "star-parser")))