From 444f6145537e95435ed463fb700838942acfebfd Mon Sep 17 00:00:00 2001
From: frese <frese>
Date: Sun, 4 Jan 2004 14:37:05 +0000
Subject: [PATCH] now using scsh's configure module

---
 configure.scm        | 27 ---------------------------
 install-pkg          |  2 +-
 load.scm.in          |  3 ---
 scheme/configure.scm | 24 ------------------------
 4 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 configure.scm
 delete mode 100644 scheme/configure.scm

diff --git a/configure.scm b/configure.scm
deleted file mode 100644
index b4fbd44..0000000
--- a/configure.scm
+++ /dev/null
@@ -1,27 +0,0 @@
-;;; Library to obtain information about the underlying platform.
-;;; $Id: configure.scm,v 1.1 2003/12/16 16:44:40 frese Exp $
-
-(define-structure configure (export host)
-  (open scheme-with-scsh
-        srfi-13)
-  (begin
-    (define (canonical-machine uname-record)
-      (let* ((machine (uname:machine uname-record))
-             (os (uname:os-name uname-record)))
-        (cond
-         ((member machine '("i386" "i486" "i586" "i686")) "i386")
-         ((or (string=? machine "Power Macintosh")
-              (and (string=? os "AIX")
-                   (regexp-search? (rx (: "00" (= 6 digit) any any "00"))
-                                   machine)))
-          "powerpc")
-         (else machine))))
-
-    (define (canonical-os-name uname-record)
-      (string-downcase (uname:os-name uname-record)))
-
-    (define (host)
-      (let ((uname-record (uname)))
-        (string-append (canonical-machine uname-record)
-                       "-"
-                       (canonical-os-name uname-record))))))
diff --git a/install-pkg b/install-pkg
index 0cf0914..d0c96a9 100755
--- a/install-pkg
+++ b/install-pkg
@@ -1,3 +1,3 @@
 #!/bin/sh
-exec scsh -lm configure.scm -lm install-lib-module.scm -o install -e install-main -s "$0" "$@"
+exec scsh -lm install-lib-module.scm -o configure -o install -e install-main -s "$0" "$@"
 !#
diff --git a/load.scm.in b/load.scm.in
index 8cf4aba..5d3ded4 100644
--- a/load.scm.in
+++ b/load.scm.in
@@ -1,10 +1,7 @@
-(config)
-(load "@scxschemedir@/configure.scm")
 (user)
 (load-package 'dynamic-externals)
 (open 'dynamic-externals)
 (open 'external-calls)
-(load-package 'configure)
 (open 'configure)
 (run '(let ((initializer-name "scx_init_xlib")
             (module-file (string-append "@scxlibdir@/" @scxhost@ "/libscx.so")))
diff --git a/scheme/configure.scm b/scheme/configure.scm
deleted file mode 100644
index ccbf1a6..0000000
--- a/scheme/configure.scm
+++ /dev/null
@@ -1,24 +0,0 @@
-(define-structure configure (export host)
-  (open scheme-with-scsh
-        srfi-13)
-  (begin
-    (define (canonical-machine uname-record)
-      (let* ((machine (uname:machine uname-record))
-             (os (uname:os-name uname-record)))
-        (cond
-         ((member machine '("i386" "i486" "i586" "i686")) "i386")
-         ((or (string=? machine "Power Macintosh")
-              (and (string=? os "AIX")
-                   (regexp-search? (rx (: "00" (= 6 digit) any any "00"))
-                                   machine)))
-          "powerpc")
-         (else machine))))
-
-    (define (canonical-os-name uname-record)
-      (string-downcase (uname:os-name uname-record)))
-
-    (define (host)
-      (let ((uname-record (uname)))
-        (string-append (canonical-machine uname-record)
-                       "-"
-                       (canonical-os-name uname-record))))))