Fix and simplify handling of MIT_SCHEME_EXE in top-level configure.

diff --git a/src/Makefile.in b/src/Makefile.in
index 75aa798e4355426d52ed1831a4dc254a6a1fbce2..ffd25c5d13cc04462543bc62a8734acc1878201d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,15 +60,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** END BOILERPLATE ****
 
-MIT_SCHEME_NATIVE = @MIT_SCHEME_NATIVE@
-MIT_SCHEME_C = mit-scheme-c
-
 LIARC_BOOT_BUNDLES = compiler cref sf star-parser
 LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin imail sos ssp xml
 
 SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
 INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
 
+MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
 AUXDIR_NAME = @AUXDIR_NAME@
 AUXDIR = @AUXDIR@
 EDDIR = $(AUXDIR)/edwin
@@ -76,11 +74,11 @@ EDDIR = $(AUXDIR)/edwin
 all: @ALL_TARGET@
 
 all-native: compile-microcode
-       @$(top_srcdir)/etc/compile.sh $(MIT_SCHEME_NATIVE) --compiler
+       @$(top_srcdir)/etc/compile.sh $(MIT_SCHEME_EXE) --compiler
        $(MAKE) build-bands
 
 all-liarc:
-       @$(top_srcdir)/etc/c-compile.sh $(MIT_SCHEME_C) --compiler
+       @$(top_srcdir)/etc/c-compile.sh $(MIT_SCHEME_EXE) --compiler
        $(MAKE) compile-liarc-bundles build-bands
 
 compile-microcode:
@@ -96,8 +94,8 @@ build-bands:
 # **** Make liarc distribution from native ****
 
 liarc-dist:
-       @$(top_srcdir)/etc/compile-boot-compiler.sh $(MIT_SCHEME_NATIVE)
-       @$(top_srcdir)/etc/c-prepare.sh $(MIT_SCHEME_NATIVE)
+       @$(top_srcdir)/etc/compile-boot-compiler.sh $(MIT_SCHEME_EXE)
+       @$(top_srcdir)/etc/c-prepare.sh $(MIT_SCHEME_EXE)
        $(MAKE) distclean
 
 # **** Build liarc from distribution ****
@@ -143,7 +141,7 @@ stamp_install-native-boot-compiler: stamp_build-native-boot-compiler
        echo "done" > $@
 
 stamp_native-compile-scheme: compile-microcode
-       @$(top_srcdir)/etc/compile.sh boot-root/bin/$(MIT_SCHEME_NATIVE) \
+       @$(top_srcdir)/etc/compile.sh boot-root/bin/$(MIT_SCHEME_EXE) \
            --library boot-root/lib/$(AUXDIR_NAME) --band boot-compiler.com
        echo "done" > $@
 

diff --git a/src/configure.ac b/src/configure.ac
index 7710fc8f2e63158ec8f59701a3e8e869476d9503..ae923dea1e92bc6785fba98239ff0e6221affe5a 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -62,25 +62,22 @@ c)
     ALL_TARGET=all-liarc
     INSTALL_COM=:
     INSTALL_LIARC_BUNDLES=install-liarc-bundles
-    MIT_SCHEME_NATIVE=mit-scheme-native
     ;;
 *)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
-    MIT_SCHEME_NATIVE=mit-scheme-${SCM_ARCH}
     ;;
 esac
 AUXDIR_NAME=mit-scheme-${SCM_ARCH}
 AUXDIR='$(libdir)'/${AUXDIR_NAME}
 
-: ${MIT_SCHEME_EXE:=${MIT_SCHEME_NATIVE}}
-
+: ${MIT_SCHEME_EXE:=mit-scheme-${SCM_ARCH}}
 if test x"${enable_host_scheme_test}" = xyes; then
     AC_MSG_CHECKING([for an existing MIT/GNU Scheme installation])
     if "${MIT_SCHEME_EXE}" --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
        :
-    elif mit-scheme --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
+    elif mit-scheme-native --batch-mode --eval '(%exit)' >/dev/null 2>&1; then
        MIT_SCHEME_EXE=mit-scheme
     else
        AC_MSG_ERROR([
@@ -100,7 +97,7 @@ fi
 AC_SUBST([ALL_TARGET])
 AC_SUBST([INSTALL_COM])
 AC_SUBST([INSTALL_LIARC_BUNDLES])
-AC_SUBST([MIT_SCHEME_NATIVE])
+AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([AUXDIR_NAME])
 AC_SUBST([AUXDIR])