From 89d9a472a5c7981e4c04fa8107a01762afe1c321 Mon Sep 17 00:00:00 2001
From: Abdulaziz Ghuloum <aghuloum@cs.indiana.edu>
Date: Wed, 24 Sep 2008 23:18:35 -0400
Subject: [PATCH] "darwin" is no longer hardcoded in
 lib/ypsilon-compat.ikarus.ss, instead, it is obtained from the target info
 that autoconf generates.

---
 lib/ypsilon-compat.ikarus.ss | 4 +---
 scheme/Makefile.am           | 1 +
 scheme/Makefile.in           | 1 +
 scheme/ikarus.main.ss        | 6 ++++--
 scheme/last-revision         | 2 +-
 scheme/makefile.ss           | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/ypsilon-compat.ikarus.ss b/lib/ypsilon-compat.ikarus.ss
index b4e984e..dbbbb71 100644
--- a/lib/ypsilon-compat.ikarus.ss
+++ b/lib/ypsilon-compat.ikarus.ss
@@ -25,9 +25,7 @@
 
   (define (architecture-feature what)
     (case what
-      [(operating-system) "darwin"]
-      [(alignof:int)             4]
-      [(sizeof:int)              4]
+      [(operating-system) (host-info)]
       [else (error 'architecture-feature "invalid args" what)]))
 
   (define (string-contains text s)
diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index dfa7745..a339a89 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -41,6 +41,7 @@ ikarus.config.ss: Makefile last-revision ../config.h
 	echo '(define ikarus-version "$(PACKAGE_VERSION)")' >$@
 	echo '(define ikarus-revision "$(shell cat last-revision)")' >>$@
 	echo '(define ikarus-lib-dir "$(pkglibdir)")' >>$@
+	echo '(define target "$(target)")' >>$@
 	echo '(define wordsize $(sizeofvoidp))' >>$@
 
 
diff --git a/scheme/Makefile.in b/scheme/Makefile.in
index 987ff19..4018281 100644
--- a/scheme/Makefile.in
+++ b/scheme/Makefile.in
@@ -380,6 +380,7 @@ ikarus.config.ss: Makefile last-revision ../config.h
 	echo '(define ikarus-version "$(PACKAGE_VERSION)")' >$@
 	echo '(define ikarus-revision "$(shell cat last-revision)")' >>$@
 	echo '(define ikarus-lib-dir "$(pkglibdir)")' >>$@
+	echo '(define target "$(target)")' >>$@
 	echo '(define wordsize $(sizeofvoidp))' >>$@
 
 ikarus.boot: $(EXTRA_DIST) ikarus.config.ss
diff --git a/scheme/ikarus.main.ss b/scheme/ikarus.main.ss
index 0b6b89e..de7addd 100644
--- a/scheme/ikarus.main.ss
+++ b/scheme/ikarus.main.ss
@@ -19,9 +19,11 @@
 ;;; libraries within the compiler itself.
 
 (library (ikarus startup)
-  (export print-greeting init-library-path)
-  (import (ikarus))
+  (export print-greeting init-library-path host-info)
+  (import (except (ikarus) host-info))
   (include "ikarus.config.ss")
+
+  (define (host-info) target)
   
   (define (print-greeting)
     (printf "Ikarus Scheme version ~a\n" 
diff --git a/scheme/last-revision b/scheme/last-revision
index 480d250..9e8e0f4 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1610
+1612
diff --git a/scheme/makefile.ss b/scheme/makefile.ss
index b2a4bea..8df923d 100755
--- a/scheme/makefile.ss
+++ b/scheme/makefile.ss
@@ -1478,6 +1478,7 @@
     [pointer-set-long   $for]
     [make-ffi           $for]
     [make-callback      $for]
+    [host-info            i]
 
   ))