From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Tue, 26 Apr 2011 18:32:42 +0000 (-0700)
Subject: Merge branch 'master' into Gtk
X-Git-Tag: 20110426-Gtk~1
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=54ee3a7b4d969e8b123e617ceb8730fab9440a46;p=mit-scheme.git

Merge branch 'master' into Gtk
---

54ee3a7b4d969e8b123e617ceb8730fab9440a46
diff --cc src/cref/redpkg.scm
index 6b545f601,be0d0e45f..732c715c7
--- a/src/cref/redpkg.scm
+++ b/src/cref/redpkg.scm
@@@ -372,15 -376,8 +376,15 @@@ USA
  			package
  			(append! (package-description/finalizations package)
  				 (list finalization))))))
 +		((DEPENDS-ON)
 +		 (if (not (check-list (cdr option) string?))
 +		     (error "Illegal depends-on" (cdr option)))
 +		 (set-package-description/depends-on!
 +		  package
 +		  (append! (package-description/depends-on package)
 +			   (map parse-filename (cdr option)))))
  		(else
- 		 (error "Unrecognized option keyword:" (car option)))))
+ 		 (warn "Unexpected option:" option))))
  	    options))
  
  (define (parse-name name)