From adedf1363e0e4fc25355b97887db1944ea89131d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 31 Jan 2022 20:33:37 +0100
Subject: Repair warnings-are-error configuration item.

---
 module/calp/main.scm            | 3 +++
 module/calp/util/exceptions.scm | 7 +++++++
 module/hnh/util/exceptions.scm  | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 module/calp/util/exceptions.scm

diff --git a/module/calp/main.scm b/module/calp/main.scm
index d1e33d55..01d66e5f 100644
--- a/module/calp/main.scm
+++ b/module/calp/main.scm
@@ -11,6 +11,9 @@
 
   :use-module ((text markup) :select (sxml->ansi-text))
   :use-module ((hnh util exceptions) :select (filter-stack))
+  ;; calp util exceptions contains the warnings-are-errors configuration
+  ;; item, this forces that to load.
+  :use-module ((calp util exceptions) :select ())
 
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 regex)
diff --git a/module/calp/util/exceptions.scm b/module/calp/util/exceptions.scm
new file mode 100644
index 00000000..1268f9f5
--- /dev/null
+++ b/module/calp/util/exceptions.scm
@@ -0,0 +1,7 @@
+(define-module (calp util exceptions)
+  :use-module (calp util config)
+  :use-module (hnh util exceptions))
+
+(define-config warnings-are-errors #f
+  description: "Crash on warnings."
+  post: warnings-are-errors)
diff --git a/module/hnh/util/exceptions.scm b/module/hnh/util/exceptions.scm
index fef0f1b5..bcfd506d 100644
--- a/module/hnh/util/exceptions.scm
+++ b/module/hnh/util/exceptions.scm
@@ -1,7 +1,6 @@
 (define-module (hnh util exceptions)
   #:use-module (srfi srfi-1)
   #:use-module (hnh util)
-  #:use-module (calp util config)
   #:use-module (ice-9 format)
 
   #:use-module ((system vm frame)
@@ -18,10 +17,6 @@
 (define-public warnings-are-errors
   (make-parameter #f))
 
-(define-config warnings-are-errors #f
-  description: "Crash on warnings."
-  post: warnings-are-errors)
-
 ;; forwards return from warning-hander. By default returns an unspecified value,
 ;; but instances are free to provide a proper return value and use it.
 (define-public (warning fmt . args)
-- 
cgit v1.2.3