gtk: Use new parameters, not fluids.

diff --git a/src/cairo/cairo-optiondb.scm b/src/cairo/cairo-optiondb.scm
index 50ebdbef1de0d394b1ea0466e92eb2a7673fe1ec..0127e6d5e3ca79ae1ddcc31161144d425128473d 100644 (file)
--- a/src/cairo/cairo-optiondb.scm
+++ b/src/cairo/cairo-optiondb.scm
@@ -11,5 +11,5 @@
 
 (further-load-options
  (merge-pathnames "optiondb"
-                 (last (fluid (access library-directory-path
-                                      (->environment '(runtime pathname)))))))
\ No newline at end of file
+                 (last ((access library-directory-path
+                                (->environment '(runtime pathname)))))))
\ No newline at end of file

diff --git a/src/cairo/check.scm b/src/cairo/check.scm
index 4aad05b8b81dd1a2d08efc31af93dac1d6aa70c3..6bf831c9c0b78535873f0de97cf89b261e804d9a 100644 (file)
--- a/src/cairo/check.scm
+++ b/src/cairo/check.scm
@@ -2,11 +2,11 @@
 
 ;;;; Test the cairo wrapper.
 
-(let ((flu (access library-directory-path
-                    (->environment '(runtime pathname))))
-      (dirname (directory-pathname (current-load-pathname))))
-  (set-fluid! flu (cons dirname (fluid flu)))
-  (set! *initial-options-file* (merge-pathnames "cairo-optiondb" dirname)))
+(let ((dirname (directory-pathname (current-load-pathname)))
+      (param (access library-directory-path
+                    (->environment '(runtime pathname)))))
+  (parameterize ((param (cons dirname (param))))
+    (set! *initial-options-file* (merge-pathnames "cairo-optiondb" dirname))
+    (load-option 'CAIRO)))
 
-(load-option 'CAIRO)
 (load "cairo-check" (->environment '(CAIRO)))
\ No newline at end of file

diff --git a/src/gl/check.scm b/src/gl/check.scm
index 4db8aa587084b7ea421511f601391c21149d886d..3c0fdfce1a6a0877e3052da38dfd59fd85642301 100644 (file)
--- a/src/gl/check.scm
+++ b/src/gl/check.scm
@@ -9,10 +9,10 @@
 
 (if (gtk-initialized?)
     (begin
-      (let ((flu (access library-directory-path
-                        (->environment '(runtime pathname)))))
-       (set-fluid! flu (cons (merge-pathnames "./") (fluid flu))))
-      (load "make")
+      (let ((param (access library-directory-path
+                          (->environment '(runtime pathname)))))
+       (parameterize ((param (cons (merge-pathnames "./") (param))))
+         (load "make")))
       (let* ((widget (make-glxgears-demo))
             (thread ((access glxgears-demo-animation-thread
                              (->environment '(gl glxgears)))

diff --git a/src/glib/check.scm b/src/glib/check.scm
index f35f39f1d116fef8f203bce90ede892eb2237813..60c38ff090091c07b1b0eb3dfc7232aa39ec5801 100644 (file)
--- a/src/glib/check.scm
+++ b/src/glib/check.scm
@@ -3,10 +3,10 @@
 ;;;; Test the glib wrapper.
 
 (let ((dirname (directory-pathname (current-load-pathname)))
-      (flu (access library-directory-path
-                  (->environment '(runtime pathname)))))
-  (set-fluid! flu (cons dirname (fluid flu)))
-  (set! *initial-options-file* (merge-pathnames "glib-optiondb" dirname)))
+      (param (access library-directory-path
+                    (->environment '(runtime pathname)))))
+  (parameterize ((param (cons dirname (param))))
+    (set! *initial-options-file* (merge-pathnames "glib-optiondb" dirname))
+    (load-option 'GLIB)))
 
-(load-option 'GLIB)
 (load "glib-check" (->environment '(GLIB)))
\ No newline at end of file

diff --git a/src/glib/glib-optiondb.scm b/src/glib/glib-optiondb.scm
index cde1d703d024a0be17891e698d6d37ba93eecfec..3d0754f01df9cc0afed89d2a886e12650d36d4cc 100644 (file)
--- a/src/glib/glib-optiondb.scm
+++ b/src/glib/glib-optiondb.scm
@@ -11,5 +11,5 @@
 
 (further-load-options
  (merge-pathnames "optiondb"
-                 (last (fluid (access library-directory-path
-                                      (->environment '(runtime pathname)))))))
\ No newline at end of file
+                 (last ((access library-directory-path
+                                (->environment '(runtime pathname)))))))
\ No newline at end of file

diff --git a/src/gtk-screen/check.scm b/src/gtk-screen/check.scm
index 8fb50080ac626a73d89a3e6b4fa2fe9d96c82edb..577649e44445545d1a21f187ed381f43cd518912 100644 (file)
--- a/src/gtk-screen/check.scm
+++ b/src/gtk-screen/check.scm
@@ -2,12 +2,14 @@
 
 ;;;; Test the gtk screen.
 
-(let ((flu (access library-directory-path (->environment '(runtime pathname))))
-      (dirname (directory-pathname (current-load-pathname))))
-  (set-fluid! flu (cons dirname (fluid flu)))
-  (set! *initial-options-file* (merge-pathnames "gtk-screen-optiondb" dirname)))
+(let ((dirname (directory-pathname (current-load-pathname)))
+      (param (access library-directory-path
+                    (->environment '(runtime pathname)))))
+  (parameterize ((param (cons dirname (param))))
+    (set! *initial-options-file* (merge-pathnames "gtk-screen-optiondb"
+                                                 dirname))
+    (load-option 'GTK-SCREEN)))
 
-(load-option 'GTK-SCREEN)
 (if (gtk-initialized?)
     (load "gtk-screen-check")
     (warn "Could not test the GTK subsystem without a DISPLAY."))
\ No newline at end of file

diff --git a/src/gtk-screen/gtk-screen-optiondb.scm b/src/gtk-screen/gtk-screen-optiondb.scm
index edf537ad81d956696bf169417d7df09fc60a6868..75d5dac26e1bd193362a857e93784e659d43604c 100644 (file)
--- a/src/gtk-screen/gtk-screen-optiondb.scm
+++ b/src/gtk-screen/gtk-screen-optiondb.scm
@@ -11,5 +11,5 @@
 
 (further-load-options
  (merge-pathnames "optiondb"
-                 (last (fluid (access library-directory-path
-                                      (->environment '(runtime pathname)))))))
\ No newline at end of file
+                 (last ((access library-directory-path
+                                (->environment '(runtime pathname)))))))
\ No newline at end of file

diff --git a/src/gtk/check.scm b/src/gtk/check.scm
index 6019ba2bc7f1334d140ce4e3811c0d725f9f35c3..ebf89c32df53789b2a9c10769839176a6f1103ac 100644 (file)
--- a/src/gtk/check.scm
+++ b/src/gtk/check.scm
@@ -3,11 +3,12 @@
 ;;;; Test the gtk wrapper.
 
 (let ((dirname (directory-pathname (current-load-pathname)))
-      (flu (access library-directory-path (->environment '(runtime pathname)))))
-  (set-fluid! flu (cons dirname (fluid flu)))
-  (set! *initial-options-file* (merge-pathnames "gtk-optiondb" dirname)))
+      (param (access library-directory-path
+                    (->environment '(runtime pathname)))))
+  (parameterize ((param (cons dirname (param))))
+    (set! *initial-options-file* (merge-pathnames "gtk-optiondb" dirname))
+    (load-option 'GTK)))
 
-(load-option 'GTK)
 (if (gtk-initialized?)
     (load "gtk-check" (->environment '(GTK)))
     (warn "Could not test the GTK subsystem without a DISPLAY."))
\ No newline at end of file

diff --git a/src/gtk/gtk-optiondb.scm b/src/gtk/gtk-optiondb.scm
index bc5c0b24543f66f4f0681620a85456597849b137..1136a024e13b17dc989507d8580d8f0a1b04636a 100644 (file)
--- a/src/gtk/gtk-optiondb.scm
+++ b/src/gtk/gtk-optiondb.scm
@@ -11,5 +11,5 @@
 
 (further-load-options
  (merge-pathnames "optiondb"
-                 (last (fluid (access library-directory-path
-                                      (->environment '(runtime pathname)))))))
\ No newline at end of file
+                 (last ((access library-directory-path
+                                (->environment '(runtime pathname)))))))
\ No newline at end of file

diff --git a/src/pango/check.scm b/src/pango/check.scm
index 1ffcefd7f331c9366bc40ef911db055239b8c154..07020735dc85f85281d40270277c7ce040e3be38 100644 (file)
--- a/src/pango/check.scm
+++ b/src/pango/check.scm
@@ -3,9 +3,10 @@
 ;;;; Test the pango wrapper.
 
 (let ((dirname (directory-pathname (current-load-pathname)))
-      (flu (access library-directory-path (->environment '(runtime pathname)))))
-  (set-fluid! flu (cons dirname (fluid flu)))
-  (set! *initial-options-file* (merge-pathnames "pango-optiondb" dirname)))
+      (param (access library-directory-path
+                    (->environment '(runtime pathname)))))
+  (parameterize ((param (cons dirname (param))))
+    (set! *initial-options-file* (merge-pathnames "pango-optiondb" dirname))
+    (load-option 'PANGO)))
 
-(load-option 'PANGO)
 (load "pango-check" (->environment '(PANGO)))
\ No newline at end of file

diff --git a/src/pango/pango-optiondb.scm b/src/pango/pango-optiondb.scm
index 65b09800bf52cd72508eeb56359135fe7b25dc31..c351eb3fa2a196644bd6f382d9952b12c104a610 100644 (file)
--- a/src/pango/pango-optiondb.scm
+++ b/src/pango/pango-optiondb.scm
@@ -11,5 +11,5 @@
 
 (further-load-options
  (merge-pathnames "optiondb"
-                 (last (fluid (access library-directory-path
-                                      (->environment '(runtime pathname)))))))
\ No newline at end of file
+                 (last ((access library-directory-path
+                                (->environment '(runtime pathname)))))))
\ No newline at end of file