gtk: Fix testing code to use new fluid library-directory-path.

diff --git a/src/cairo/cairo-optiondb.scm b/src/cairo/cairo-optiondb.scm
index 672717a0e6a22bf49284a95d676a164b71c2f095..50ebdbef1de0d394b1ea0466e92eb2a7673fe1ec 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 (access library-directory-path
-                               (->environment '(runtime pathname))))))
\ No newline at end of file
+                 (last (fluid (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 585ddf46f814f2fd24b29c222451da716b9386b9..4aad05b8b81dd1a2d08efc31af93dac1d6aa70c3 100644 (file)
--- a/src/cairo/check.scm
+++ b/src/cairo/check.scm
@@ -2,10 +2,10 @@
 
 ;;;; Test the cairo wrapper.
 
-(let ((env (->environment '(runtime pathname)))
+(let ((flu (access library-directory-path
+                    (->environment '(runtime pathname))))
       (dirname (directory-pathname (current-load-pathname))))
-  (set! (access library-directory-path env)
-       (cons dirname (access library-directory-path env)))
+  (set-fluid! flu (cons dirname (fluid flu)))
   (set! *initial-options-file* (merge-pathnames "cairo-optiondb" dirname)))
 
 (load-option 'CAIRO)

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

diff --git a/src/glib/check.scm b/src/glib/check.scm
index 643e838a6a31fcb2a1364e350473475d6b4c77bd..f35f39f1d116fef8f203bce90ede892eb2237813 100644 (file)
--- a/src/glib/check.scm
+++ b/src/glib/check.scm
@@ -2,10 +2,10 @@
 
 ;;;; Test the glib wrapper.
 
-(let ((env (->environment '(runtime pathname)))
-      (dirname (directory-pathname (current-load-pathname))))
-  (set! (access library-directory-path env)
-       (cons dirname (access library-directory-path env)))
+(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)))
 
 (load-option 'GLIB)

diff --git a/src/glib/glib-optiondb.scm b/src/glib/glib-optiondb.scm
index 317eec22d0616c9323684ba15c616b03dad261b9..cde1d703d024a0be17891e698d6d37ba93eecfec 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 (access library-directory-path
-                               (->environment '(runtime pathname))))))
\ No newline at end of file
+                 (last (fluid (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 6522aab60f4ad346d74aef4e2a340e53ad8356b0..6019ba2bc7f1334d140ce4e3811c0d725f9f35c3 100644 (file)
--- a/src/gtk/check.scm
+++ b/src/gtk/check.scm
@@ -2,10 +2,9 @@
 
 ;;;; Test the gtk wrapper.
 
-(let ((env (->environment '(runtime pathname)))
-      (dirname (directory-pathname (current-load-pathname))))
-  (set! (access library-directory-path env)
-       (cons dirname (access library-directory-path env)))
+(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)))
 
 (load-option 'GTK)

diff --git a/src/gtk/gtk-optiondb.scm b/src/gtk/gtk-optiondb.scm
index 1bfbfe2de8de2a0d02b7ffea33d5c9f8f0c07193..bc5c0b24543f66f4f0681620a85456597849b137 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 (access library-directory-path
-                               (->environment '(runtime pathname))))))
\ No newline at end of file
+                 (last (fluid (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 ba526821384741fb9aaafc19192b80f3b92ce1d0..1ffcefd7f331c9366bc40ef911db055239b8c154 100644 (file)
--- a/src/pango/check.scm
+++ b/src/pango/check.scm
@@ -2,10 +2,9 @@
 
 ;;;; Test the pango wrapper.
 
-(let ((env (->environment '(runtime pathname)))
-      (dirname (directory-pathname (current-load-pathname))))
-  (set! (access library-directory-path env)
-       (cons dirname (access library-directory-path env)))
+(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)))
 
 (load-option 'PANGO)

diff --git a/src/pango/pango-optiondb.scm b/src/pango/pango-optiondb.scm
index 3298a02eaa298f96d50a65215379768f4207b043..65b09800bf52cd72508eeb56359135fe7b25dc31 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 (access library-directory-path
-                               (->environment '(runtime pathname))))))
\ No newline at end of file
+                 (last (fluid (access library-directory-path
+                                      (->environment '(runtime pathname)))))))
\ No newline at end of file