From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Thu, 12 Sep 2013 17:09:18 +0000 (-0700)
Subject: Merge branch 'master' into Gtk
X-Git-Tag: mit-scheme-pucked-9.2.12~476
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e1f2fc0bd5db02845f51142565ad8a56d2d33aed;p=mit-scheme.git

Merge branch 'master' into Gtk
---

e1f2fc0bd5db02845f51142565ad8a56d2d33aed
diff --cc src/Setup.sh
index 33f0d7bf0,b9ca82cdf..ea7b4227d
--- a/src/Setup.sh
+++ b/src/Setup.sh
@@@ -85,13 -85,8 +85,9 @@@ maybe_link lib/include ../microcod
  maybe_link lib/optiondb.scm ../etc/optiondb.scm
  maybe_link lib/runtime ../runtime
  maybe_link lib/compiler ../compiler
 +maybe_link lib/sos ../sos
  maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
  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/gtk ../gtk
  
  maybe_link config.sub microcode/config.sub
  maybe_link config.guess microcode/config.guess