guile-gnome, devel: fix modules toplevel calls moved into an eval-when conditions exp...

[David Pirotte <david@altosw.be>]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

Hello,

	guile-gnome, devel:
	  fix modules toplevel calls moved into an eval-when conditions exp...

Patch review solicited.

Thanks,
David

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-fix-modules-toplevel-calls-moved-into-an-eval-when-c.patch --]
[-- Type: text/x-patch, Size: 26780 bytes --]

From 7b1e50fd1031dbb3672a8dc28e730f057f600576 Mon Sep 17 00:00:00 2001
From: David PIROTTE <david@altosw.be>
Date: Mon, 12 May 2014 20:55:16 -0300
Subject: [PATCH 5/5] fix modules toplevel calls moved into an eval-when
 conditions exp...

* atk/gnome/atk.scm:
* corba/gnome/corba.scm:
* corba/gnome/corba/primitives.scm:
* corba/gnome/corba/types.scm:
* gconf/gnome/gconf.scm:
* glib/gnome/glib.scm:
* glib/gnome/gobject/defs-support.scm:
* glib/gnome/gobject/gclosure.scm:
* glib/gnome/gobject/gobject.scm:
* glib/gnome/gobject/gparameter.scm:
* glib/gnome/gobject/gsignal.scm:
* glib/gnome/gobject/gtype.scm:
* glib/gnome/gobject/gvalue.scm:
* glib/gnome/gobject/gw-spec-utils.scm:
* glib/gnome/gobject/gw-utils.scm:
* glib/gnome/gw/generics.scm:
* glib/gnome/gw/support/g-wrap.scm:
* glib/gnome/gw/support/gobject.scm:
* glib/gnome/gw/support/gtk-doc.scm:
* glib/gnome/gw/support/modules.scm:
* glib/test-suite/exceptions.scm:
* gnome-vfs/gnome/vfs.scm:
* gtk/gnome/contrib/help-browser.scm:
* gtk/gnome/gtk.scm:
* libglade/gnome/glade.scm:
* libgnome/gnome/gnome.scm:
* libgnomecanvas/gnome/canvas.scm:
* libgnomeui/gnome/gnome-ui.scm:
* pango/gnome/pango.scm:
* pango/gnome/pangocairo.scm: Toplevel calls moved into an eval-when
  conditions exp...
---
 atk/gnome/atk.scm                    |  3 ++-
 corba/gnome/corba.scm                | 27 ++++++++++++----------
 corba/gnome/corba/primitives.scm     |  7 +++---
 corba/gnome/corba/types.scm          |  8 +++----
 gconf/gnome/gconf.scm                |  3 ++-
 glib/gnome/glib.scm                  |  6 +++--
 glib/gnome/gobject/defs-support.scm  |  9 ++++----
 glib/gnome/gobject/gclosure.scm      |  5 ++--
 glib/gnome/gobject/gobject.scm       | 10 +++++---
 glib/gnome/gobject/gparameter.scm    |  6 +++--
 glib/gnome/gobject/gsignal.scm       |  5 ++--
 glib/gnome/gobject/gtype.scm         | 22 ++++++++++--------
 glib/gnome/gobject/gvalue.scm        |  8 ++++---
 glib/gnome/gobject/gw-spec-utils.scm |  9 ++++----
 glib/gnome/gobject/gw-utils.scm      |  9 ++++----
 glib/gnome/gw/generics.scm           | 35 ++++++++++++++--------------
 glib/gnome/gw/support/g-wrap.scm     |  9 ++++----
 glib/gnome/gw/support/gobject.scm    |  2 +-
 glib/gnome/gw/support/gtk-doc.scm    | 45 ++++++++++++++++++------------------
 glib/gnome/gw/support/modules.scm    | 13 ++++++-----
 glib/test-suite/exceptions.scm       |  7 +++---
 gnome-vfs/gnome/vfs.scm              |  3 ++-
 gtk/gnome/contrib/help-browser.scm   | 10 ++++----
 gtk/gnome/gtk.scm                    | 13 +++++++----
 libglade/gnome/glade.scm             |  3 ++-
 libgnome/gnome/gnome.scm             |  3 ++-
 libgnomecanvas/gnome/canvas.scm      |  3 ++-
 libgnomeui/gnome/gnome-ui.scm        |  3 ++-
 pango/gnome/pango.scm                |  3 ++-
 pango/gnome/pangocairo.scm           |  3 ++-
 30 files changed, 166 insertions(+), 126 deletions(-)

diff --git a/atk/gnome/atk.scm b/atk/gnome/atk.scm
index f872ecb..b799a12 100644
--- a/atk/gnome/atk.scm
+++ b/atk/gnome/atk.scm
@@ -29,4 +29,5 @@
   #:use-module (gnome gw atk)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw atk))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw atk)))
diff --git a/corba/gnome/corba.scm b/corba/gnome/corba.scm
index f9aa0db..ab2ed21 100644
--- a/corba/gnome/corba.scm
+++ b/corba/gnome/corba.scm
@@ -217,13 +217,15 @@
   :use-module (gnome gobject)
   :use-module (oop goops))
 
-(re-export <PortableServer-ServantBase> <CORBA:Object>
-	   gnome-corba-error)
+(eval-when (expand load eval)
+  (re-export <PortableServer-ServantBase> <CORBA:Object>
+	     gnome-corba-error))
 
-(%init-gnome-corba)
+(eval-when (load eval)
+  (%init-gnome-corba)
 
-(or (corba-primitive-open-module "Bonobo")
-    (gnome-corba-error "Can't open `Bonobo' module"))
+  (or (corba-primitive-open-module "Bonobo")
+      (gnome-corba-error "Can't open `Bonobo' module")))
 
 \f
 ;;; {Records}
@@ -359,11 +361,12 @@
 	(and (corba-struct? this) (set! this (corba-struct->record this)))
 	(set! thelist (append! thelist (list this)))))))
 
-(provide 'corba-record)
+(eval-when (expand load eval)
+  (provide 'corba-record)
 
-(export corba-record-type-vtable
-	corba-record-type? make-corba-record-type corba-record-typecode
-	corba-record-type-fields corba-record-constructor corba-record-predicate
-	corba-record-accessor corba-record-modifier corba-record?
-	corba-record-type-descriptor corba-record-constructor-from-struct
-	corba-struct->record corba-sequence->list)
+  (export corba-record-type-vtable
+	  corba-record-type? make-corba-record-type corba-record-typecode
+	  corba-record-type-fields corba-record-constructor corba-record-predicate
+	  corba-record-accessor corba-record-modifier corba-record?
+	  corba-record-type-descriptor corba-record-constructor-from-struct
+	  corba-struct->record corba-sequence->list))
diff --git a/corba/gnome/corba/primitives.scm b/corba/gnome/corba/primitives.scm
index a0f3ee4..2e8577a 100644
--- a/corba/gnome/corba/primitives.scm
+++ b/corba/gnome/corba/primitives.scm
@@ -39,7 +39,8 @@
   (corba-typecode #:allocation #:each-subclass)
   (corba-objref))
 
-(%init-gnome-corba-primitives)
+(eval-when (load eval)
+  (%init-gnome-corba-primitives))
 
 (define-method (allocate-instance (class <PortableServer-ServantBase>) initargs)
   (corba-primitive-make-poa-instance class))
@@ -66,5 +67,5 @@
 	  (display #\> file))
 	(next-method))))
 
-(export <PortableServer-ServantBase> <CORBA:Object>)
-
+(eval-when (expand load eval)
+  (export <PortableServer-ServantBase> <CORBA:Object>))
diff --git a/corba/gnome/corba/types.scm b/corba/gnome/corba/types.scm
index bec438c..24d0fb7 100644
--- a/corba/gnome/corba/types.scm
+++ b/corba/gnome/corba/types.scm
@@ -28,12 +28,12 @@
 (define-module (gnome corba types)
   :use-module (gnome gw corba)
   :use-module (gnome gobject)
-  :use-module (oop goops))
+  :use-module (oop goops)
+  :export (gnome-corba-error))
 
 (define (gnome-corba-error format-string . args)
   (save-stack)
   (scm-error 'gnome-corba-error #f format-string args '()))
 
-(%init-gnome-corba-types)
-
-(export gnome-corba-error)
+(eval-when (load eval)
+  (%init-gnome-corba-types))
diff --git a/gconf/gnome/gconf.scm b/gconf/gnome/gconf.scm
index 14762d5..ea1be33 100644
--- a/gconf/gnome/gconf.scm
+++ b/gconf/gnome/gconf.scm
@@ -30,4 +30,5 @@
   #:use-module (gnome gw gconf)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw gconf))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw gconf)))
diff --git a/glib/gnome/glib.scm b/glib/gnome/glib.scm
index c8a1569..d7eb465 100644
--- a/glib/gnome/glib.scm
+++ b/glib/gnome/glib.scm
@@ -33,7 +33,8 @@
 
   #:re-export (g-source-set-closure))
 
-(re-export-modules (gnome gw glib))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw glib)))
 
 (define-public (g-idle-add proc)
   (let ((closure (make <gclosure>
@@ -53,7 +54,8 @@
     (g-source-set-priority source 200) ; G_PRIORITY_DEFAULT_IDLE
     (g-source-attach source #f)))
 
-(use-modules (gnome gobject event-repl))
+(eval-when (expand load eval)
+  (use-modules (gnome gobject event-repl)))
 
 ;; taken from gnome-guile 0.10.0
 
diff --git a/glib/gnome/gobject/defs-support.scm b/glib/gnome/gobject/defs-support.scm
index d9479ad..aca7bd1 100644
--- a/glib/gnome/gobject/defs-support.scm
+++ b/glib/gnome/gobject/defs-support.scm
@@ -27,7 +27,8 @@
 (define-module (gnome gobject defs-support)
   #:use-module (gnome gw support modules))
 
-(begin-deprecated
- (issue-deprecation-warning
-  "`(gnome gobject defs-support)' is deprecated. Use `(gnome gw support defs)' instead.")
- (re-export-modules (gnome gw support defs)))
+(eval-when (expand load eval)
+  (begin-deprecated
+   (issue-deprecation-warning
+    "`(gnome gobject defs-support)' is deprecated. Use `(gnome gw support defs)' instead.")
+   (re-export-modules (gnome gw support defs))))
diff --git a/glib/gnome/gobject/gclosure.scm b/glib/gnome/gobject/gclosure.scm
index ce3ce2c..fdf9409 100644
--- a/glib/gnome/gobject/gclosure.scm
+++ b/glib/gnome/gobject/gclosure.scm
@@ -55,8 +55,9 @@
 
   #:export     (<gclosure> gclosure-invoke))
 
-(dynamic-call "scm_init_gnome_gobject_closures"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_closures"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
 (define-class-with-docs <gclosure> (<gboxed>)
   "The Scheme representation of a GLib closure: a typed procedure
diff --git a/glib/gnome/gobject/gobject.scm b/glib/gnome/gobject/gobject.scm
index 08742be..6d5e073 100644
--- a/glib/gnome/gobject/gobject.scm
+++ b/glib/gnome/gobject/gobject.scm
@@ -84,8 +84,10 @@
                 gobject-class-get-property-names
                 gobject-get-property gobject-set-property))
 
-(dynamic-call "scm_init_gnome_gobject"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
+
 
 ;;;
 ;;; {Class Initialization}
@@ -232,6 +234,7 @@ defined on the class, if such a slot is not already defined.
   #:value-type <gobject>
   #:gtype-name "GParamObject")
 
+
 ;;;
 ;;; {GObject Properties}
 ;;;
@@ -278,4 +281,5 @@ calls @code{(slot-ref obj name)}."
       (slot-ref object name)
       (gruntime-error "Properties added after object definition must be accessed via custom property methods: ~A" name)))
 
-(%gnome-gobject-object-post-init)
+(eval-when (load eval)
+  (%gnome-gobject-object-post-init))
diff --git a/glib/gnome/gobject/gparameter.scm b/glib/gnome/gobject/gparameter.scm
index 0506fba..1a33394 100644
--- a/glib/gnome/gobject/gparameter.scm
+++ b/glib/gnome/gobject/gparameter.scm
@@ -113,8 +113,10 @@
   #:gtype-name "GParam"
   #:metaclass <gparam-class>)
 
-(dynamic-call "scm_init_gnome_gobject_parameters"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_parameters"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
 (define-class-with-docs <gparam-char> (<gparam>)
   "Parameter for @code{<gchar>} values."
diff --git a/glib/gnome/gobject/gsignal.scm b/glib/gnome/gobject/gsignal.scm
index 079e06e..bbe0636 100644
--- a/glib/gnome/gobject/gsignal.scm
+++ b/glib/gnome/gobject/gsignal.scm
@@ -94,8 +94,9 @@ its name, and how it should be called."
             (class-name (class-of obj)) (name obj) (return-type obj)
             (cons (interface-type obj) (param-types obj)))))
 
-(dynamic-call "scm_init_gnome_gobject_signals"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_signals"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
 (define (gtype-class-get-signal-names class)
   "Returns a vector of signal names belonging to @var{class} and all
diff --git a/glib/gnome/gobject/gtype.scm b/glib/gnome/gobject/gtype.scm
index dcf7baf..56a3439 100644
--- a/glib/gnome/gobject/gtype.scm
+++ b/glib/gnome/gobject/gtype.scm
@@ -49,10 +49,11 @@
                 gruntime-error
                 gtype-instance-destroy!))
 
-(dynamic-call "scm_init_gnome_gobject_gc"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
-(dynamic-call "scm_init_gnome_gobject_types"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_gc"
+		(dynamic-link *guile-gnome-gobject-lib-path*))
+  (dynamic-call "scm_init_gnome_gobject_types"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
 (define (gruntime-error format-string . args)
   "Signal a runtime error. The error will be thrown to the key
@@ -65,7 +66,6 @@
 ;;; {Base Class Hierarchy]
 ;;;
 
-
 (define-class-with-docs <gtype-class> (<class>)
   "The metaclass of all GType classes. Ensures that GType classes have a
 @code{gtype} slot, which records the primitive GType information for
@@ -87,8 +87,9 @@ this class."
 (define-method (write (class <gtype-class>) file)
   (format file "#<~a ~a>" (class-name (class-of class)) (class-name class)))
 
-(dynamic-call "scm_init_gnome_gobject_types_gtype_class"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_types_gtype_class"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
 (define-class-with-docs <gtype-instance> ()
   "The root class of all instantiatable GType classes. Adds a slot,
@@ -102,14 +103,15 @@ value."
   (next-method)
   (%gtype-instance-construct instance initargs))
 
-(dynamic-call "scm_init_gnome_gobject_types_gtype_instance"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_types_gtype_instance"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
+
 
 ;;;
 ;;; {Misc]
 ;;;
 
-
 (define (class-name->gtype-name class-name)
   "Convert the name of a class into a suitable name for a GType. For
 example:
diff --git a/glib/gnome/gobject/gvalue.scm b/glib/gnome/gobject/gvalue.scm
index 1e4dd8d..af88a08 100644
--- a/glib/gnome/gobject/gvalue.scm
+++ b/glib/gnome/gobject/gvalue.scm
@@ -84,10 +84,12 @@
   #:gtype-name #t
   #:metaclass <gvalue-class>)
 
-(dynamic-call "scm_init_gnome_gobject_values"
-              (dynamic-link *guile-gnome-gobject-lib-path*))
+(eval-when (expand load eval)
+  (dynamic-call "scm_init_gnome_gobject_values"
+		(dynamic-link *guile-gnome-gobject-lib-path*)))
 
-(%bless-gvalue-class <gvalue>)
+(eval-when (load eval)
+  (%bless-gvalue-class <gvalue>))
 
 (define-method (allocate-instance (class <gvalue-class>) initargs)
   (let ((instance (next-method)))
diff --git a/glib/gnome/gobject/gw-spec-utils.scm b/glib/gnome/gobject/gw-spec-utils.scm
index 037d94a..3845e05 100644
--- a/glib/gnome/gobject/gw-spec-utils.scm
+++ b/glib/gnome/gobject/gw-spec-utils.scm
@@ -28,7 +28,8 @@
 (define-module (gnome gobject gw-spec-utils)
   #:use-module (gnome gw support modules))
 
-(begin-deprecated
- (issue-deprecation-warning
-  "`(gnome gobject gw-spec-utils)' is deprecated. Use `(gnome gw support gobject)' instead.")
- (re-export-modules (gnome gw support gobject)))
+(eval-when (expand load eval)
+  (begin-deprecated
+   (issue-deprecation-warning
+    "`(gnome gobject gw-spec-utils)' is deprecated. Use `(gnome gw support gobject)' instead.")
+   (re-export-modules (gnome gw support gobject))))
diff --git a/glib/gnome/gobject/gw-utils.scm b/glib/gnome/gobject/gw-utils.scm
index a78d4fa..d8595cd 100644
--- a/glib/gnome/gobject/gw-utils.scm
+++ b/glib/gnome/gobject/gw-utils.scm
@@ -28,7 +28,8 @@
 (define-module (gnome gobject gw-utils)
   #:use-module (gnome gw support modules))
 
-(begin-deprecated
- (issue-deprecation-warning
-  "`(gnome gobject gw-utils)' is deprecated. Use `(gnome gw support modules)' instead.")
- (re-export-modules (gnome gw support modules)))
+(eval-when (expand load eval)
+  (begin-deprecated
+   (issue-deprecation-warning
+    "`(gnome gobject gw-utils)' is deprecated. Use `(gnome gw support modules)' instead.")
+   (re-export-modules (gnome gw support modules))))
diff --git a/glib/gnome/gw/generics.scm b/glib/gnome/gw/generics.scm
index 0c069a5..a23d369 100644
--- a/glib/gnome/gw/generics.scm
+++ b/glib/gnome/gw/generics.scm
@@ -36,22 +36,23 @@
   #:use-module (gnome gobject)
   #:use-module (gnome gobject generics))
 
-;; Re-export (gnome gobject generics)
-(module-use! (module-public-interface (current-module))
-             (resolve-interface '(gnome gobject generics)))
+(eval-when (expand load eval)
+  ;; Re-export (gnome gobject generics)
+  (module-use! (module-public-interface (current-module))
+	       (resolve-interface '(gnome gobject generics)))
 
-(module-for-each 
- (lambda (k v)
-   (module-add! (current-module) k v))
- (resolve-interface '(gnome gobject generics)))
+  (module-for-each
+   (lambda (k v)
+     (module-add! (current-module) k v))
+   (resolve-interface '(gnome gobject generics)))
 
-(let ((mod (current-module)))
-  (set-module-binder!
-   (module-public-interface mod)
-   (lambda (interface sym define?)
-     (case sym
-       ((%gw-latent-variables-hash %module-public-interface) #f)
-       (else
-        (let ((var (module-local-variable mod sym)))
-          (if var (module-add! interface sym var))
-          var))))))
+  (let ((mod (current-module)))
+    (set-module-binder!
+     (module-public-interface mod)
+     (lambda (interface sym define?)
+       (case sym
+	 ((%gw-latent-variables-hash %module-public-interface) #f)
+	 (else
+	  (let ((var (module-local-variable mod sym)))
+	    (if var (module-add! interface sym var))
+	    var)))))))
diff --git a/glib/gnome/gw/support/g-wrap.scm b/glib/gnome/gw/support/g-wrap.scm
index d94c528..2b66ae2 100644
--- a/glib/gnome/gw/support/g-wrap.scm
+++ b/glib/gnome/gw/support/g-wrap.scm
@@ -32,7 +32,8 @@
   #:use-module (g-wrap scm-codegen)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (g-wrap)
-                   (g-wrap guile)
-                   (g-wrap c-codegen)
-                   (g-wrap scm-codegen))
+(eval-when (expand load eval)
+  (re-export-modules (g-wrap)
+		     (g-wrap guile)
+		     (g-wrap c-codegen)
+		     (g-wrap scm-codegen)))
diff --git a/glib/gnome/gw/support/gobject.scm b/glib/gnome/gw/support/gobject.scm
index b178015..8191568 100644
--- a/glib/gnome/gw/support/gobject.scm
+++ b/glib/gnome/gw/support/gobject.scm
@@ -1114,7 +1114,7 @@ example:
 
            (let ((wrapset-name-c-sym (any-str->c-sym-str
                                       (symbol->string (name wrapset)))))
-             `(eval-when (eval load compile)
+             `(eval-when (expand load eval)
                 (load-extension ,(if (slot-ref wrapset 'shlib-abs?)
                                      `(string-append
                                        *g-wrap-shlib-dir*
diff --git a/glib/gnome/gw/support/gtk-doc.scm b/glib/gnome/gw/support/gtk-doc.scm
index 45f4ae3..463bfc8 100644
--- a/glib/gnome/gw/support/gtk-doc.scm
+++ b/glib/gnome/gw/support/gtk-doc.scm
@@ -133,28 +133,29 @@
           (car default)
           (error "missing attribute" name))))
 
-;; Make SSAX understand &nbsp; and &percnt; -- nasty, but that's how it
-;; is
-(for-each
- (lambda (pair)
-   (cond-expand
-    (guile-2
-     (define-parsed-entity! (car pair) (cdr pair)))
-    (else
-     (set! ssax:predefined-parsed-entities
-           (assoc-set! ssax:predefined-parsed-entities
-                       (car pair) (cdr pair))))))
- '((nbsp . " ")
-   (percnt . "%")
-   (oacute . "ó")
-   (sol . "/")
-   (mdash . "&#x2014;")
-   (ast . "&#x002A;")
-   (num . "&#x0023;")
-   (times . "✕")
-   (ldquo . "“")
-   (rdquo . "”")
-   (hash . "#")))
+(eval-when (expand load eval)
+  ;; Make SSAX understand &nbsp; and &percnt; -- nasty, but that's how it
+  ;; is
+  (for-each
+      (lambda (pair)
+	(cond-expand
+	 (guile-2
+	  (define-parsed-entity! (car pair) (cdr pair)))
+	 (else
+	  (set! ssax:predefined-parsed-entities
+		(assoc-set! ssax:predefined-parsed-entities
+			    (car pair) (cdr pair))))))
+      '((nbsp . " ")
+	(percnt . "%")
+	(oacute . "ó")
+	(sol . "/")
+	(mdash . "&#x2014;")
+	(ast . "&#x002A;")
+	(num . "&#x0023;")
+	(times . "✕")
+	(ldquo . "“")
+	(rdquo . "”")
+	(hash . "#"))))
 
 (define (zap-whitespace sxml)
   (define (not-whitespace x)
diff --git a/glib/gnome/gw/support/modules.scm b/glib/gnome/gw/support/modules.scm
index 0447e2e..7ed28d0 100644
--- a/glib/gnome/gw/support/modules.scm
+++ b/glib/gnome/gw/support/modules.scm
@@ -54,12 +54,13 @@
    (else
     (for-each force-bindings (module-uses module)))))
 
-(and=> (and (not (batch-mode?))
-            (module-variable (resolve-module '(ice-9 session))
-                             'apropos-hook))
-       (lambda (v)
-         (add-hook! (variable-ref v)
-                    (lambda (mod pat) (force-bindings mod)))))
+(eval-when (expand load eval)
+  (and=> (and (not (batch-mode?))
+	      (module-variable (resolve-module '(ice-9 session))
+			       'apropos-hook))
+	 (lambda (v)
+	   (add-hook! (variable-ref v)
+		      (lambda (mod pat) (force-bindings mod))))))
 
 (define-macro (re-export-modules . args)
   "Re-export the public interface of a module; used like
diff --git a/glib/test-suite/exceptions.scm b/glib/test-suite/exceptions.scm
index dd4d68d..65e1570 100644
--- a/glib/test-suite/exceptions.scm
+++ b/glib/test-suite/exceptions.scm
@@ -22,9 +22,10 @@
   #:export (exception:value-arg-missing
             exception:wrong-number-of-args))
 
-(defmacro deferr (name-frag error re)
+(define-macro (deferr name-frag error re)
   (let ((name (symbol-append 'exception: name-frag)))
     `(define ,name (cons ,error ,re))))
 
-(deferr value-arg-missing     'gruntime-error "^Missing #:value argument")
-(deferr wrong-number-of-args  'gruntime-error "^Wrong number of arguments")
+(eval-when (expand load eval)
+  (deferr value-arg-missing     'gruntime-error "^Missing #:value argument")
+  (deferr wrong-number-of-args  'gruntime-error "^Wrong number of arguments"))
diff --git a/gnome-vfs/gnome/vfs.scm b/gnome-vfs/gnome/vfs.scm
index b70645a..2f2cfca 100644
--- a/gnome-vfs/gnome/vfs.scm
+++ b/gnome-vfs/gnome/vfs.scm
@@ -30,4 +30,5 @@
   #:use-module (gnome gw gnome-vfs)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw gnome-vfs))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw gnome-vfs)))
diff --git a/gtk/gnome/contrib/help-browser.scm b/gtk/gnome/contrib/help-browser.scm
index 8a43b77..cff7678 100644
--- a/gtk/gnome/contrib/help-browser.scm
+++ b/gtk/gnome/contrib/help-browser.scm
@@ -66,10 +66,11 @@
   #:export (set-default-help-document! add-help-root! show-help
             populate-help-hook the-help-window))
 
-(warn "(gnome contrib help-browser) is still in development. ")
-(warn "It might eat your baby! In any case, don't rely on it yet.")
+(eval-when (expand load eval)
+  (warn "(gnome contrib help-browser) is still in development. ")
+  (warn "It might eat your baby! In any case, don't rely on it yet.")
 
-(pk "mmm, babies taste good")
+  (pk "mmm, babies taste good"))
 
 ;; Add a `buffer' column to a normal delay-tree-model
 (define-class <help-tree> (<delay-tree-model>))
@@ -349,4 +350,5 @@ top of the manual."
         (select-node (find-node node-name manual-name) node-name))
     (present window)))
 
-(add-hook! stexi-buffer-xref-activated-hook show-help)
+(eval-when (expand load eval)
+  (add-hook! stexi-buffer-xref-activated-hook show-help))
diff --git a/gtk/gnome/gtk.scm b/gtk/gnome/gtk.scm
index e274085..c165bcf 100644
--- a/gtk/gnome/gtk.scm
+++ b/gtk/gnome/gtk.scm
@@ -43,10 +43,11 @@
 (define-macro (time-debug . forms)
   `(begin ,@forms))
 
-(time-debug (use-modules (gnome gw gdk)))
-(time-debug (use-modules (gnome gw gtk)))
-(re-export-modules (gnome gw gdk)
-                   (gnome gw gtk))
+(eval-when (expand load eval)
+  (time-debug (use-modules (gnome gw gdk)))
+  (time-debug (use-modules (gnome gw gtk)))
+  (re-export-modules (gnome gw gdk)
+		     (gnome gw gtk)))
 
 ;; Support explicit object destruction.
 (define-method (initialize (instance <gtk-object>) initargs)
@@ -116,7 +117,9 @@
             (loop (cddr props)))))))
 (define-method (create-tag (buffer <gtk-text-buffer>) tag-name . properties)
   (apply gtk-text-buffer-create-tag buffer tag-name properties))
-(export create-tag)
+
+(eval-when (expand load eval)
+  (export create-tag))
 
 (define (gtk-stock-id nick)
   (string-append "gtk-" (symbol->string nick)))
diff --git a/libglade/gnome/glade.scm b/libglade/gnome/glade.scm
index 2ac7ef1..a50f97a 100644
--- a/libglade/gnome/glade.scm
+++ b/libglade/gnome/glade.scm
@@ -32,4 +32,5 @@
   #:use-module (gnome gw libglade)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw libglade))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw libglade)))
diff --git a/libgnome/gnome/gnome.scm b/libgnome/gnome/gnome.scm
index b096d4f..8b20bfd 100644
--- a/libgnome/gnome/gnome.scm
+++ b/libgnome/gnome/gnome.scm
@@ -31,7 +31,8 @@
   #:use-module (gnome gw support modules)
   #:export (gnome-program-init))
 
-(re-export-modules (gnome gw libgnome))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw libgnome)))
 
 (define (gnome-program-init name version . properties)
   (let ((program (%gnome-program-init name version)))
diff --git a/libgnomecanvas/gnome/canvas.scm b/libgnomecanvas/gnome/canvas.scm
index 16facf0..b21af28 100644
--- a/libgnomecanvas/gnome/canvas.scm
+++ b/libgnomecanvas/gnome/canvas.scm
@@ -31,5 +31,6 @@
   #:use-module (gnome gw generics)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw canvas))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw canvas)))
 
diff --git a/libgnomeui/gnome/gnome-ui.scm b/libgnomeui/gnome/gnome-ui.scm
index 44f00ac..63800f5 100644
--- a/libgnomeui/gnome/gnome-ui.scm
+++ b/libgnomeui/gnome/gnome-ui.scm
@@ -29,4 +29,5 @@
   #:use-module (gnome gw libgnomeui)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw libgnomeui))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw libgnomeui)))
diff --git a/pango/gnome/pango.scm b/pango/gnome/pango.scm
index 277dd6a..8134d7d 100644
--- a/pango/gnome/pango.scm
+++ b/pango/gnome/pango.scm
@@ -29,4 +29,5 @@
   #:use-module (gnome gw pango)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw pango))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw pango)))
diff --git a/pango/gnome/pangocairo.scm b/pango/gnome/pangocairo.scm
index c80f4b6..8e0706b 100644
--- a/pango/gnome/pangocairo.scm
+++ b/pango/gnome/pangocairo.scm
@@ -29,4 +29,5 @@
   #:use-module (gnome gw pangocairo)
   #:use-module (gnome gw support modules))
 
-(re-export-modules (gnome gw pangocairo))
+(eval-when (expand load eval)
+  (re-export-modules (gnome gw pangocairo)))
-- 
2.0.0.rc0