~ salmonella-environment-setup (master) 05c70c8466eafd76f2874256cf04d020cfdfcfb7

commit 05c70c8466eafd76f2874256cf04d020cfdfcfb7
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun Nov 22 10:23:07 2020 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun Nov 22 10:23:07 2020 +0100

    conf: more CHICKEN-5 support-related changes (use/import)

diff --git a/conf/common/chicken-4.scm b/conf/common/chicken-4.scm
index f919a76..14c147c 100644
--- a/conf/common/chicken-4.scm
+++ b/conf/common/chicken-4.scm
@@ -1,4 +1,13 @@
-(use salmonella-run-publish-params)
+(import scheme)
+(cond-expand
+  (chicken-4
+   (import chicken)
+   (use salmonella-run-publish-params))
+  (chicken-5
+   (import (chicken process-context))
+   (import salmonella-run-publish-params))
+  (else
+   (error "Unsupported CHICKEN version.")))
 
 (chicken-core-branch "chicken-4")
 
diff --git a/conf/common/common.scm b/conf/common/common.scm
index e6840ad..d360a68 100644
--- a/conf/common/common.scm
+++ b/conf/common/common.scm
@@ -1,4 +1,15 @@
-(use salmonella-run-publish-params posix files extras)
+(import scheme)
+(cond-expand
+  (chicken-4
+   (import chicken)
+   (use salmonella-run-publish-params posix files extras))
+  (chicken-5
+   (import (chicken format)
+           (chicken platform)
+           (chicken process-context))
+   (import salmonella-run-publish-params))
+  (else
+   (error "Unsupported CHICKEN version.")))
 
 (keep-repo? #t)