From bad6939091bd84cf48c99e6b8b8f8416eb2335d3 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Tue, 6 May 2014 23:19:42 -0700
Subject: [PATCH] configure: Move check for __x86_64__.

Move AC_CHECK_DECL(__x86_64__) before AC_MSG_CHECKING([for native-code
support]) so that the former's progress note does not arrive in the
middle of the latter's, like this:

checking for native-code support... checking whether __x86_64__ is declared... no
yes, for i386
---
 src/microcode/aclocal.m4 | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/microcode/aclocal.m4 b/src/microcode/aclocal.m4
index b32413c81..9c9470d86 100644
--- a/src/microcode/aclocal.m4
+++ b/src/microcode/aclocal.m4
@@ -3,6 +3,19 @@
 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
+    ;;
+esac
+
 AC_MSG_CHECKING([for native-code support])
 case ${_mit_scheme_native_code_spec} in
 yes|YES|y|Y)
@@ -13,10 +26,8 @@ yes|YES|y|Y)
     hppa*)
 	mit_scheme_native_code=hppa
 	;;
-    i?86)
-	AC_CHECK_DECL([__x86_64__],
-		      [mit_scheme_native_code=x86-64],
-		      [mit_scheme_native_code=i386])
+    i386)
+	mit_scheme_native_code=i386
 	;;
     m68k|m680?0)
 	mit_scheme_native_code=mc68k
-- 
2.25.1