gtk: Simplify make.scm.

Suppression of option loading messages is now the default.

diff --git a/src/gtk/make.scm b/src/gtk/make.scm
index 61e2fe485f730946b085208b8449f25c09b01f1d..40ecef2965c4f65655eea48c44461257bba65b99 100644 (file)
--- a/src/gtk/make.scm
+++ b/src/gtk/make.scm
@@ -2,23 +2,11 @@
 
 Load the Gtk option. |#
 
-(define ((option-note-writer option) port)
-  (write-string "Loading " port)
-  (write-string (symbol-name option) port)
-  (write-string " option" port))
-
-(define (ld option)
-  (with-notification
-   (option-note-writer option)
-   (lambda () (load-option option))))
-
-(with-notification
- (option-note-writer 'GTK)
- (lambda ()
-   (fluid-let ((load/suppress-loading-message? #t))
-     (ld 'SUBPROCESS) ;; Hacked in main.scm.
-     (ld 'SOS)
-     (ld 'FFI) ;; Referenced in gtk.pkg.
-     (load-package-set "gtk"))
-   (add-subsystem-identification! "Gtk" '(0 4))
-   ((access gtk-start (->environment '(gtk main))))))
\ No newline at end of file
+(load-option 'SUBPROCESS)              ; Hacked in main.scm.
+(load-option 'SOS)
+(load-option 'FFI)                     ; Referenced in gtk.pkg.
+(with-loader-base-uri (system-library-uri "gtk/")
+  (lambda ()
+    (load-package-set "gtk")))
+(add-subsystem-identification! "Gtk" '(0 4))
+((access gtk-start (->environment '(gtk main))))
\ No newline at end of file