From 39175b785f2e5d3362f3bd72a41f2702190333e1 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Fri, 20 Nov 2009 11:46:42 +0100
Subject: Remove circular dependency introduced by `(skribilo sui)'.

* src/guile/skribilo/sui.scm (sui-referenced-file)[html-file]: New
  procedure.
---
 src/guile/skribilo/sui.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/guile')

diff --git a/src/guile/skribilo/sui.scm b/src/guile/skribilo/sui.scm
index 8e5cb12..3388ce8 100644
--- a/src/guile/skribilo/sui.scm
+++ b/src/guile/skribilo/sui.scm
@@ -26,7 +26,6 @@
   :autoload   (skribilo reader)     (make-reader)
   :autoload   (skribilo engine)     (find-engine)
   :autoload   (skribilo evaluator)  (evaluate-document)
-  :autoload   (skribilo engine html)(html-file)
   :use-module (skribilo condition)
   :use-module (skribilo utils strings)
   :use-module (skribilo utils syntax)
@@ -294,6 +293,13 @@
 ;*    sui-referenced-file ...                                          */
 ;*---------------------------------------------------------------------*/
 (define (sui-referenced-file n e)
+
+   ;; Hack to avoid a compile-time dependency on the HTML engine, which would
+   ;; create a dependency loop:
+   ;; (package base) -> (sui) -> (engine html) -> (package base).
+   (define html-file
+     (@ (skribilo engine html) html-file))
+
    (let ((file (html-file n e)))
       (if (member (file-suffix file) '("skb" "sui" "skr" "html"))
 	  (string-append (strip-ref-base (file-prefix file)) ".html")
-- 
cgit v1.2.3