squash! mescc: Support running on Mes with modules.

XXX
  * Use/port cond-expand-provide instead adding new global
     mes-guile-modules?
  * What about this running (mescc:main) twice?

* mes/module/mes/guile-module.mes (mes-guile-modules): New variable.
* module/mescc.scm: Use it to avoid loading mes modules.
* scripts/mescc.scm.in (guile): Likewise.

mes/module/mes/guile-module.mes

@@ -1885,6 +1885,12 @@
      interface)))
 
 
+
+;;; {Mes: Features for cond-expand}
+;;;
+
+(define mes-guile-modules #t)
+
 
 ;;; Place the user in the guile-user module.
 ;;;

module/mescc.scm

@@ -25,16 +25,17 @@
   #:export (mescc:main))
 
 (cond-expand
+ (guile
+  (define-macro (mes-use-module . rest) #t))
+ (mes-guile-modules
+  (define-macro (mes-use-module . rest) #t))
  (mes
   (define (set-port-encoding! port encoding) #t)
   (mes-use-module (mes guile))
   (mes-use-module (mes misc))
   (mes-use-module (mes getopt-long))
   (mes-use-module (mes display))
-  (mes-use-module (mescc mescc))
-  )
- (guile
-  (define-macro (mes-use-module . rest) #t)))
+  (mes-use-module (mescc mescc))))
 
 (define %host-arch (or (getenv "%arch") %arch))
 (define %host-kernel (or (getenv "%kernel") "linux")) ;; FIXME

scripts/mescc.scm.in

@@ -62,13 +62,13 @@
 (setenv "%numbered_arch" (if %numbered-arch? "true" "false"))
 
 (cond-expand
- (mes
-  (if (current-module)
-      (use-modules (mescc))
-      (mes-use-module (mescc)))
-  (mescc:main (command-line)))
  (guile
-  (use-modules (mescc))))
+  (use-modules (mescc)))
+ (mes-guile-modules
+  (use-modules (mescc)))
+ (mes
+  (mes-use-module (mescc))
+  (mescc:main (command-line))))
 
 (define (main args)
   (mescc:main args))