From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 2 Mar 2017 04:15:21 +0000 (-0700)
Subject: plugin optiondb.scm: Further-load-options expects a thunk.
X-Git-Tag: mit-scheme-pucked-9.2.12~202
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e185ea4966cb811ba8781dd7b40999d32fcabcf0;p=mit-scheme.git

plugin optiondb.scm: Further-load-options expects a thunk.
---

diff --git a/src/cairo/optiondb.scm b/src/cairo/optiondb.scm
index 367dd40fc..c773b042a 100644
--- a/src/cairo/optiondb.scm
+++ b/src/cairo/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'CAIRO
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file
diff --git a/src/gl/optiondb.scm b/src/gl/optiondb.scm
index 177fdb438..fc09ba652 100644
--- a/src/gl/optiondb.scm
+++ b/src/gl/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'GL
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file
diff --git a/src/glib/optiondb.scm b/src/glib/optiondb.scm
index 54c1b10fb..517ee12d7 100644
--- a/src/glib/optiondb.scm
+++ b/src/glib/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'GLIB
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file
diff --git a/src/gtk-screen/optiondb.scm b/src/gtk-screen/optiondb.scm
index bc0331d92..fabc50565 100644
--- a/src/gtk-screen/optiondb.scm
+++ b/src/gtk-screen/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'GTK-SCREEN
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file
diff --git a/src/gtk/optiondb.scm b/src/gtk/optiondb.scm
index 57e98e07c..39212ac46 100644
--- a/src/gtk/optiondb.scm
+++ b/src/gtk/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'GTK
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file
diff --git a/src/pango/optiondb.scm b/src/pango/optiondb.scm
index 7758b96fe..6ede3663e 100644
--- a/src/pango/optiondb.scm
+++ b/src/pango/optiondb.scm
@@ -1,7 +1,5 @@
 #| -*-Scheme-*- |#
 
-;;;; Test optiondb, includes the installed system's optiondb.
-
 (define-load-option 'PANGO
   (let ((pathname
 	 (merge-pathnames "make"
@@ -10,6 +8,7 @@
       (load pathname))))
 
 (further-load-options
- (merge-pathnames "optiondb"
-		  (cadr (access library-directory-path
-				(->environment '(runtime pathname))))))
\ No newline at end of file
+ (named-lambda (system-load-options)
+   (merge-pathnames "optiondb"
+		    (cadr (access library-directory-path
+				  (->environment '(runtime pathname)))))))
\ No newline at end of file