Don't allow AC_CHECK_DECL([__x86_64__]) to override user-specified cpu spec.

diff --git a/src/microcode/aclocal.m4 b/src/microcode/aclocal.m4
index 3016efd59bec94d23a84e5f485740eb0696c70f2..b32413c819e02afe2b070e088159776c953605cd 100644 (file)
--- a/src/microcode/aclocal.m4
+++ b/src/microcode/aclocal.m4
@@ -3,15 +3,10 @@
 AC_DEFUN([MIT_SCHEME_NATIVE_CODE],[
 _mit_scheme_native_code_spec=$1
 _mit_scheme_native_code_host_cpu=$2
-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 ${host_cpu} in
+    case ${_mit_scheme_native_code_host_cpu} in
     alpha*)
        mit_scheme_native_code=alpha
        ;;
@@ -19,7 +14,9 @@ yes|YES|y|Y)
        mit_scheme_native_code=hppa
        ;;
     i?86)
-       mit_scheme_native_code=i386
+       AC_CHECK_DECL([__x86_64__],
+                     [mit_scheme_native_code=x86-64],
+                     [mit_scheme_native_code=i386])
        ;;
     m68k|m680?0)
        mit_scheme_native_code=mc68k