From 7850dc8007bc7fce9b4bb2af4526c04e9132a449 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 8 Dec 2000 17:53:58 +0000
Subject: [PATCH] Use autoconf for top-level Makefile.

---
 v7/src/Makefile.in  | 8 ++------
 v7/src/Makefile.std | 7 ++-----
 v7/src/Setup.sh     | 7 ++++++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 95c27bd9f..737eddff5 100644
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.1 2000/12/08 17:47:19 cph Exp $
+# $Id: Makefile.in,v 1.2 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -73,9 +73,6 @@ all:
 	scheme -compiler -heap 4000 < etc/compile.scm
 	etc/build-bands.sh
 
-setup:
-	./Setup.sh $(SUBDIRS)
-
 mostlyclean clean distclean maintainer-clean:
 	./Clean.sh $@ $(SUBDIRS)
 
@@ -134,5 +131,4 @@ install: all
 	    $(INSTALL_DATA) imail/$${FN} $(DESTDIR)$(AUXDIR)/imail/.;\
 	done
 
-.PHONY: all setup mostlyclean clean distclean maintainer-clean
-.PHONY: tags TAGS install
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install
diff --git a/v7/src/Makefile.std b/v7/src/Makefile.std
index a6ae3ccfc..5e45176cd 100644
--- a/v7/src/Makefile.std
+++ b/v7/src/Makefile.std
@@ -1,4 +1,4 @@
-# $Id: Makefile.std,v 1.10 2000/12/08 06:04:32 cph Exp $
+# $Id: Makefile.std,v 1.11 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,9 +26,6 @@ SHELL = /bin/sh
 all:
 	echo "No ALL action"
 
-setup:
-	./Setup.sh
-
 mostlyclean clean distclean maintainer-clean:
 	./Clean.sh $@
 
@@ -53,5 +50,5 @@ stage3:
 unstage3:
 	./Stage.sh unmake 3
 
-.PHONY: all setup mostlyclean clean distclean maintainer-clean tags TAGS
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS
 .PHONY: stage1 unstage1 stage2 unstage2 stage3 unstage3
diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index 49270eeb4..e651dfeab 100755
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.2 2000/12/08 06:19:43 cph Exp $
+# $Id: Setup.sh,v 1.3 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -21,6 +21,11 @@
 # Utility to set up the MIT Scheme build directories.
 # The working directory must be the top-level source directory.
 
+if [ ! -x configure ]; then
+    echo "autoconf"
+    autoconf
+fi
+
 maybe_mkdir ()
 {
     if [ ! -e ${1} ]; then
-- 
2.25.1