From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Wed, 11 May 2016 20:42:46 +0000 (-0700)
Subject: 0001-allow-autoreconf-force.patch from bap (Barak A. Pearlmutter).
X-Git-Tag: mit-scheme-pucked-9.2.12~318
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=fa5b365b5a4ee073c54f2b1be48a33c996ed3835;p=mit-scheme.git

0001-allow-autoreconf-force.patch from bap (Barak A. Pearlmutter).

  From: "Barak A. Pearlmutter" <barak+git@cs.nuim.ie>
  Date: Mon, 22 Jul 2013 19:58:13 +0200
  Subject: allow autoreconf force

Recombobulate slightly to allow full regeneration via the command
$ autoreconf --force

- move src/microcode/aclocal.m4 to src/microcode/mit_scheme_native_code.m4

- use single shared directory locally-defined macros (src/microcode/ for now)

The necessary local m4 macro file is explicitly included.
This is necessary because autoconf is not using automake or libtools,
so  AC_CONFIG_MACRO_DIR([.../microcode]) won't work.  Gulp.
---

diff --git a/src/configure.ac b/src/configure.ac
index e15b195d7..4b0574ba0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3,6 +3,10 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([MIT/GNU Scheme], [9.2], [bug-mit-scheme@gnu.org], [mit-scheme])
 AC_CONFIG_SRCDIR([microcode/boot.c])
 AC_CONFIG_AUX_DIR([microcode])
+# Would set m4 macro dir, but only works if automake or libtools in use.
+# Instead we include directly.
+# AC_CONFIG_MACRO_DIR([microcode])
+m4_include([microcode/mit_scheme_native_code.m4])
 AC_PROG_MAKE_SET
 
 AC_COPYRIGHT(
diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index b7a85a44e..8c1ecc335 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -2,6 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT([MIT/GNU Scheme microcode], [15.3], [bug-mit-scheme@gnu.org], [mit-scheme])
 AC_CONFIG_SRCDIR([boot.c])
+# Would set m4 macro dir, but only works if automake or libtools in use.
+# Instead we include directly.
+# AC_CONFIG_MACRO_DIR([../microcode])
+m4_include([../microcode/mit_scheme_native_code.m4])
 AC_CONFIG_HEADERS([config.h])
 AC_PROG_MAKE_SET
 
diff --git a/src/microcode/aclocal.m4 b/src/microcode/mit_scheme_native_code.m4
similarity index 81%
rename from src/microcode/aclocal.m4
rename to src/microcode/mit_scheme_native_code.m4
index 9c9470d86..3016efd59 100644
--- a/src/microcode/aclocal.m4
+++ b/src/microcode/mit_scheme_native_code.m4
@@ -3,30 +3,22 @@
 AC_DEFUN([MIT_SCHEME_NATIVE_CODE],[
 _mit_scheme_native_code_spec=$1
 _mit_scheme_native_code_host_cpu=$2
-
-case ${_mit_scheme_native_code_spec} in
-yes|YES|y|Y)
-    case ${_mit_scheme_native_code_host_cpu} in
-    i?86)
-	AC_CHECK_DECL([__x86_64__],
-		      [_mit_scheme_native_code_host_cpu=x86_64],
-		      [_mit_scheme_native_code_host_cpu=i386])
-	;;
-    esac
+case ${_mit_scheme_native_code_host_cpu} in
+i?86)
+    AC_CHECK_DECL([__x86_64__],[_mit_scheme_native_code_host_cpu=x86_64])
     ;;
 esac
-
 AC_MSG_CHECKING([for native-code support])
 case ${_mit_scheme_native_code_spec} in
 yes|YES|y|Y)
-    case ${_mit_scheme_native_code_host_cpu} in
+    case ${host_cpu} in
     alpha*)
 	mit_scheme_native_code=alpha
 	;;
     hppa*)
 	mit_scheme_native_code=hppa
 	;;
-    i386)
+    i?86)
 	mit_scheme_native_code=i386
 	;;
     m68k|m680?0)