From 964a21cda917962b52d499adb5a0f832a9c326c7 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 25 Sep 2018 09:46:34 -0700 Subject: [PATCH] Use/mention (further-load-options #t) in optiondbs/READMEs. --- src/cairo/README | 14 ++++++++++++++ src/cairo/optiondb.scm | 6 +----- src/devops/README | 14 ++++++++++++++ src/devops/optiondb.scm | 6 +----- src/gl/README | 14 ++++++++++++++ src/gl/optiondb.scm | 6 +----- src/glib/README | 14 ++++++++++++++ src/glib/optiondb.scm | 6 +----- src/gtk-screen/README | 14 ++++++++++++++ src/gtk-screen/optiondb.scm | 6 +----- src/gtk/README | 14 ++++++++++++++ src/gtk/optiondb.scm | 6 +----- src/pango/README | 14 ++++++++++++++ src/pango/optiondb.scm | 6 +----- src/planetarium/README | 14 ++++++++++++++ src/planetarium/mit-optiondb.scm | 5 +---- src/runtime/optiondb.scm | 11 ++++++----- 17 files changed, 126 insertions(+), 44 deletions(-) diff --git a/src/cairo/README b/src/cairo/README index f529ae6de..170c75d94 100644 --- a/src/cairo/README +++ b/src/cairo/README @@ -14,6 +14,20 @@ Then to build and install the plugin: make all check make install install-html +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use the plugin: (load-option 'cairo) diff --git a/src/cairo/optiondb.scm b/src/cairo/optiondb.scm index c773b042a..54a0fd3de 100644 --- a/src/cairo/optiondb.scm +++ b/src/cairo/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (cairo-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/devops/README b/src/devops/README index 8c7a372d4..39e450ce5 100644 --- a/src/devops/README +++ b/src/devops/README @@ -11,4 +11,18 @@ The plugin is built and installed in the customary GNU way: make make install +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + For more information see the accompanying manual. diff --git a/src/devops/optiondb.scm b/src/devops/optiondb.scm index 6a141192a..d5ca9a341 100644 --- a/src/devops/optiondb.scm +++ b/src/devops/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (gl-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/gl/README b/src/gl/README index 7a8def22a..650e9a2f3 100644 --- a/src/gl/README +++ b/src/gl/README @@ -14,6 +14,20 @@ Then to build and install the plugin: make all check make install +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use the plugin: (load-option 'GL) diff --git a/src/gl/optiondb.scm b/src/gl/optiondb.scm index fc09ba652..f41a00dc4 100644 --- a/src/gl/optiondb.scm +++ b/src/gl/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (gl-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/glib/README b/src/glib/README index c378b1fe4..34ee79020 100644 --- a/src/glib/README +++ b/src/glib/README @@ -14,6 +14,20 @@ Then to build and install the plugin: make all check make install install-html +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use the plugin: (load-option 'glib) diff --git a/src/glib/optiondb.scm b/src/glib/optiondb.scm index 517ee12d7..2edb7999c 100644 --- a/src/glib/optiondb.scm +++ b/src/glib/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (glib-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/gtk-screen/README b/src/gtk-screen/README index 20e0c1e6d..53cedb25f 100644 --- a/src/gtk-screen/README +++ b/src/gtk-screen/README @@ -11,6 +11,20 @@ The option is built and installed in the customary GNU way: make all check make install +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To try it out: (load-option 'GTK-SCREEN) diff --git a/src/gtk-screen/optiondb.scm b/src/gtk-screen/optiondb.scm index fabc50565..6c3ff44f7 100644 --- a/src/gtk-screen/optiondb.scm +++ b/src/gtk-screen/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (gtk-screen-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/gtk/README b/src/gtk/README index ca43bc320..53fca68e9 100644 --- a/src/gtk/README +++ b/src/gtk/README @@ -42,6 +42,20 @@ Then to build and install the plugin: make all check make install install-html +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use the plugin: (load-option 'gtk) diff --git a/src/gtk/optiondb.scm b/src/gtk/optiondb.scm index 39212ac46..c142bbb11 100644 --- a/src/gtk/optiondb.scm +++ b/src/gtk/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (gtk-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/pango/README b/src/pango/README index 7f8493dee..39b4cafdc 100644 --- a/src/pango/README +++ b/src/pango/README @@ -14,6 +14,20 @@ Then to build and install the plugin: make all check make install install-html +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use the plugin: (load-option 'pango) diff --git a/src/pango/optiondb.scm b/src/pango/optiondb.scm index 6ede3663e..dbb841631 100644 --- a/src/pango/optiondb.scm +++ b/src/pango/optiondb.scm @@ -7,8 +7,4 @@ (named-lambda (pango-option-loader) (load pathname)))) -(further-load-options - (named-lambda (system-load-options) - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname))))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/planetarium/README b/src/planetarium/README index 68d327f25..2a7d1fe8c 100644 --- a/src/planetarium/README +++ b/src/planetarium/README @@ -13,6 +13,20 @@ To build and install: make all check make install install-html +The last command will attempt to create a subdirectory in the first +directory on Scheme's library path. If that directory is not writable +by you, super-user privileges may be required. + +You can put a writable directory at the front of your Scheme's library +path by setting the MITSCHEME_LIBRARY_PATH environment variable and +creating a short optiondb file. + + mkdir ~/.mit-scheme-x86-64 + echo "(further-load-options #t)" > ~/.mit-scheme-x86-64/optiondb.scm + export MITSCHEME_LIBRARY_PATH=\ + ~/.mit-scheme-x86-64:/usr/local/lib/mit-scheme-x86-64 + make install + To use: (load-option 'PLANETARIUM) diff --git a/src/planetarium/mit-optiondb.scm b/src/planetarium/mit-optiondb.scm index 48482ec74..efba67889 100644 --- a/src/planetarium/mit-optiondb.scm +++ b/src/planetarium/mit-optiondb.scm @@ -9,7 +9,4 @@ (named-lambda (planetarium-option-loader) (load pathname)))) -(further-load-options - (merge-pathnames "optiondb" - (cadr (access library-directory-path - (->environment '(runtime pathname)))))) \ No newline at end of file +(further-load-options #t) \ No newline at end of file diff --git a/src/runtime/optiondb.scm b/src/runtime/optiondb.scm index 1a6a346ac..0ffad07e1 100644 --- a/src/runtime/optiondb.scm +++ b/src/runtime/optiondb.scm @@ -47,11 +47,12 @@ USA. ;; ;; (FURTHER-LOAD-OPTIONS EXPR) ;; EXPR is the place to look next for the load options. Useful objects -;; are STANDARD-LOAD-OPTIONS (load options supplied with the -;; MIT-Scheme distribution) and LOCAL-LOAD-OPTIONS (load options -;; supplied for every user of your architecture at your site). If -;; not specified, or is #F, then this file is the last options -;; database that is searched. +;; are #T (load options supplied in the next optiondb file in the +;; library directory path), STANDARD-LOAD-OPTIONS (those supplied with +;; the MIT-Scheme distribution) and LOCAL-LOAD-OPTIONS (those supplied +;; for every user of your architecture at your site). If not +;; specified, or is #F, then this file is the last options database +;; that is searched. ;; Standard load options are defined like this: -- 2.25.1