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

diff --git a/src/cairo/optiondb.scm b/src/cairo/optiondb.scm
index 367dd40fc70715700fddffa9b51e68126ee7e1df..c773b042aa9a593770f50d1aa5edf87e0cdd38ea 100644 (file)
--- 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 177fdb4387f2b32c3862c1e03c348618cf12b0b1..fc09ba6526bc5a9a591658a4c5eb61d01655778b 100644 (file)
--- 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 54c1b10fbe90efdbac6c842aec442d18a428a474..517ee12d70bdd95645ab139e5a71efa5959acdc7 100644 (file)
--- 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 bc0331d92aeffec99cb2d9680e8650d5a6a1733e..fabc5056548978e5b34d9130b69fd904f93d2fb4 100644 (file)
--- 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 57e98e07c48f0fee4cee7877204566f1203bc18f..39212ac46edc338f326658c37cc7677821036d07 100644 (file)
--- 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 7758b96fe45b2c6b9197ab93c3fc293bfc6922ae..6ede3663ee48361e5feb92223264012cb48230b3 100644 (file)
--- 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