From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 29 Apr 2007 18:01:44 +0000 (+0000)
Subject: After "make c" completes, generate a file "liarc.stamp" and use that
X-Git-Tag: 20090517-FFI~627
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=c9adba28b61f2af8f1c3b7661b9fe87d0f9a969f;p=mit-scheme.git

After "make c" completes, generate a file "liarc.stamp" and use that
file to change the default value of "--enable-native-code" in
"./configure".
---

diff --git a/v7/src/Clean.sh b/v7/src/Clean.sh
index 3756e6b8b..67755ea13 100755
--- a/v7/src/Clean.sh
+++ b/v7/src/Clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Clean.sh,v 1.11 2007/04/04 05:08:18 riastradh Exp $
+# $Id: Clean.sh,v 1.12 2007/04/29 18:01:33 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -59,6 +59,11 @@ maintainer-clean)
     ;;
 esac
 
+if [ "${COMMAND}" != c-clean ]; then
+    echo "rm -f liarc.stamp"
+    rm -f liarc.stamp
+fi
+
 if [ ${FULL} = yes ]; then
     echo "rm -f lib/*.com"
     rm -f lib/*.com
diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 3db88d3e5..374e9d67f 100644
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.31 2007/04/07 04:02:04 cph Exp $
+# $Id: Makefile.in,v 1.32 2007/04/29 18:01:39 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -79,6 +79,8 @@ all:
 
 c: boot-compiler.com
 	$(srcdir)/etc/c-prepare.sh
+	-rm -f liarc.stamp
+	echo "done" > liarc.stamp
 
 boot-compiler.com:
 	$(srcdir)/etc/c-boot-compiler.sh
diff --git a/v7/src/configure.ac b/v7/src/configure.ac
index 0e156a210..d10ced85d 100644
--- a/v7/src/configure.ac
+++ b/v7/src/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme], [7.7.91], [bug-mit-scheme@gnu.org], [mit-scheme])
-AC_REVISION([$Id: configure.ac,v 1.7 2007/04/04 05:08:18 riastradh Exp $])
+AC_REVISION([$Id: configure.ac,v 1.8 2007/04/29 18:01:44 cph Exp $])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_PROG_MAKE_SET
 
@@ -31,7 +31,11 @@ USA.
 AC_ARG_ENABLE([native-code],
     AS_HELP_STRING([--enable-native-code],
 	[Support native compiled code if available [[yes]]]))
-: ${enable_native_code='yes'}
+if test -f liarc.stamp; then
+    : ${enable_native_code='c'}
+else
+    : ${enable_native_code='yes'}
+fi
 
 case ${enable_native_code} in
 c)
@@ -52,7 +56,7 @@ AC_SUBST(INSTALL_COM)
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
-if test "$(${INSTALL} --help 2> /dev/null | fgrep -e --preserve-timestamps)"
+if test "`${INSTALL} --help 2> /dev/null | fgrep -e --preserve-timestamps`"
 then
     INSTALL="${INSTALL} --preserve-timestamps"
 fi