From e185ea4966cb811ba8781dd7b40999d32fcabcf0 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 1 Mar 2017 21:15:21 -0700 Subject: [PATCH] plugin optiondb.scm: Further-load-options expects a thunk. --- src/cairo/optiondb.scm | 9 ++++----- src/gl/optiondb.scm | 9 ++++----- src/glib/optiondb.scm | 9 ++++----- src/gtk-screen/optiondb.scm | 9 ++++----- src/gtk/optiondb.scm | 9 ++++----- src/pango/optiondb.scm | 9 ++++----- 6 files changed, 24 insertions(+), 30 deletions(-) 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 -- 2.25.1