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

Merge branch 'master' into Gtk
---

a3cde5d9b34466b9e172f5cf24b7541e43501f1c
diff --cc src/configure.ac
index 57ade1fc6,27bdea69f..eb830d550
--- a/src/configure.ac
+++ b/src/configure.ac
@@@ -64,17 -64,6 +64,12 @@@ els
  fi
  DEFAULT_TARGET=${with_default_target}
  
- AC_ARG_WITH([default-target],
-     AS_HELP_STRING([--with-default-target],
- 	[Set the default make target [[all]]]))
- DEFAULT_TARGET=${with_default_target=all}
- 
 +AC_ARG_WITH([gtk],
 +    [AS_HELP_STRING([--with-gtk],
 +	[Support the GNOME Toolkits [[auto]]])],
 +    [],
 +    [with_gtk=auto])
 +
  AC_CANONICAL_HOST
  
  MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
diff --cc tests/runtime/test-char-set.scm
index 3bcd57f9e,a991cdf57..c9b25dcd1
--- a/tests/runtime/test-char-set.scm
+++ b/tests/runtime/test-char-set.scm
@@@ -374,14 -374,7 +374,14 @@@ USA
    (n+1-generator 2-generator))
  
  (define interesting-svls
 -  (cons (list)
 -	(append! (1-generator interesting-points)
 -		 (2-generator interesting-points)
 -		 (3-generator interesting-points))))
 +  (if (let ((v (get-environment-variable "FAST")))
 +	(or (eq? v #f) (string-null? v)))
 +      (begin
 +	(warn "To avoid long runtimes, export FAST=y.")
 +	(cons (list)
 +	      (append! (1-generator interesting-points)
 +		       (2-generator interesting-points)
 +		       (3-generator interesting-points))))
 +      (begin
 +	(cons (list)
- 	      (1-generator interesting-points)))))
++	      (1-generator interesting-points)))))