Merge branch 'master' into ELisp

diff --cc src/Setup.sh
index f2b4aa39333840edb3d3f0fc7227740717ea2939,a184ee99f9ca2cbe5556bca26a3228f5f21dfde4..e8f43793027d4091d10c09ab22844a35dd10b27a
--- 1/src/Setup.sh
--- 2/src/Setup.sh
+++ b/src/Setup.sh
@@@ -84,8 -84,8 +84,9 @@@ maybe_link lib/edwin ../edwi
  maybe_link lib/include ../microcode
  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/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

diff --cc src/configure.ac
Simple merge

diff --cc src/etc/compile.scm
Simple merge

diff --cc src/etc/create-makefiles.sh
Simple merge

diff --cc src/etc/optiondb.scm
Simple merge