From fa3f23105ddcf07c5900de47f19af43d1db1b597 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Mon, 20 Feb 2017 00:05:27 -0800
Subject: Import Upstream version 2c3

---
 mklibcat.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'mklibcat.scm')

diff --git a/mklibcat.scm b/mklibcat.scm
index 050a3ba..dbc26d9 100644
--- a/mklibcat.scm
+++ b/mklibcat.scm
@@ -90,7 +90,7 @@
 	     (qp			.	"qp")
 	     (break	defmacro	.	"break")
 	     (trace	defmacro	.	"trace")
-	     ;;(eval			.	"eval")
+	     (eval			.	"eval")
 	     (record			.	"record")
 	     (promise			.	"promise")
 	     (synchk			.	"synchk")
@@ -99,7 +99,7 @@
 	     (syntax-case		.	"scainit")
 	     (syntactic-closures	.	"scmacro")
 	     (macros-that-work		.	"macwork")
-	     (macro			.	macros-that-work)
+	     (macro			.	macro-by-example)
 	     (yasos		macro	.	"yasos")
 	     (oop			.	yasos)
 	     (collect		macro	.	"collect")
@@ -119,10 +119,14 @@
 	     (relational-database	.	"rdms")
 	     (database-utilities	.	"dbutil")
 	     (database-browse		.	"dbrowse")
+	     (html-form			.	"htmlform")
 	     (alist-table		.	"alistab")
 	     (parameters		.	"paramlst")
+	     (getopt-parameters		.	"getparam")
 	     (read-command		.	"comparse")
 	     (batch			.	"batch")
+	     (glob			.	"glob")
+	     (filename			.	glob)
 	     (make-crc			.	"makcrc")
 	     (wt-tree			.	"wttree")
 	     (string-search		.	"strsrch")
@@ -134,6 +138,7 @@
 	     (determinant		.	"determ")
 	     (byte			.	"byte")
 	     (tzfile			.	"tzfile")
+	     (schmooz			.	"schmooz")
 	     (new-catalog		.	"mklibcat")
 	     ))))
     (display " " op)
@@ -145,11 +150,14 @@
     (newline op)
     (display ")" op) (newline op)
 
-    (let ((mkimpcat (in-vicinity (implementation-vicinity) "mkimpcat")))
-      (cond ((not (file-exists? mkimpcat))
-	     (set! mkimpcat (string-append mkimpcat (scheme-file-suffix)))))
-      (cond ((file-exists? mkimpcat)
-	     (slib:load-source mkimpcat))))
+    (let ((load-if-exists
+	   (lambda (path)
+	     (cond ((not (file-exists? path))
+		    (set! path (string-append path (scheme-file-suffix)))))
+	     (cond ((file-exists? path)
+		    (slib:load-source path))))))
+      ;;(load-if-exists (in-vicinity (implementation-vicinity) "mksitcat"))
+      (load-if-exists (in-vicinity (implementation-vicinity) "mkimpcat")))
 
     (let ((catcat
 	   (lambda (vicinity name specificity)
-- 
cgit v1.2.3