From fbbba0435f1ddcd5020599017781c8e88443bda2 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 6 Apr 2018 14:23:45 +0200
Subject: [PATCH 1/2] cond-expand: allow mes.

---
 module/nyacc/lang/util.scm | 3 ++-
 module/nyacc/lex.scm       | 3 ++-
 module/nyacc/parse.scm     | 3 ++-
 module/nyacc/util.scm      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/nyacc/lang/util.scm b/module/nyacc/lang/util.scm
index 3de9ee4..b617885 100644
--- a/module/nyacc/lang/util.scm
+++ b/module/nyacc/lang/util.scm
@@ -44,7 +44,8 @@
    #t)
   (guile
    (use-modules (ice-9 optargs))
-   (use-modules (srfi srfi-16))))
+   (use-modules (srfi srfi-16)))
+  (mes))
 
 ;; This is a generic copyright/licence that will be printed in the output
 ;; of the examples/nyacc/lang/*/ actions.scm and tables.scm files.
diff --git a/module/nyacc/lex.scm b/module/nyacc/lex.scm
index 3e5c1e3..5122856 100644
--- a/module/nyacc/lex.scm
+++ b/module/nyacc/lex.scm
@@ -59,7 +59,8 @@
   (guile-2 #t)
   (guile
    (use-modules (ice-9 optargs))
-   (use-modules (ice-9 syncase))))
+   (use-modules (ice-9 syncase)))
+  (mes))
 
 (define (sf fmt . args) (apply simple-format #t fmt args))
   
diff --git a/module/nyacc/parse.scm b/module/nyacc/parse.scm
index 39ceca3..51d73cd 100644
--- a/module/nyacc/parse.scm
+++ b/module/nyacc/parse.scm
@@ -27,7 +27,8 @@
    (use-modules (srfi srfi-43)))
   (guile
    (use-modules (ice-9 optargs))
-   (use-modules (nyacc compat18))))
+   (use-modules (nyacc compat18)))
+  (mes))
 
 ;; @item (machine-hashed? mach) => #t|#f
 ;; Indicate if the machine has been hashed.
diff --git a/module/nyacc/util.scm b/module/nyacc/util.scm
index ed7168b..1d34449 100644
--- a/module/nyacc/util.scm
+++ b/module/nyacc/util.scm
@@ -34,7 +34,7 @@
   (guile
    (use-modules (ice-9 optargs))
    (use-modules (nyacc compat18)))
-  )
+  (mes))
 
 (define (fmtstr fmt . args)
   (apply simple-format #f fmt args))
-- 
2.16.2