[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108043: * configure.in: Use m/intel386.h for amd64 with x32 ABI.

[Glenn Morris]

------------------------------------------------------------
revno: 108043
fixes bug: http://debbugs.gnu.org/11669
author: Ulrich Mueller <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-06-21 15:42:32 -0400
message:
  * configure.in: Use m/intel386.h for amd64 with x32 ABI.
  (Do not merge to trunk.)
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-01 09:51:00 +0000
+++ b/ChangeLog 2012-06-21 19:42:32 +0000
@@ -1,3 +1,7 @@
+2012-06-21  Ulrich Mueller  <address@hidden>
+
+       * configure.in: Use m/intel386.h for amd64 with x32 ABI.  (Bug#11669)
+
 2012-06-01  Chong Yidong  <address@hidden>
 
        * Version 24.1 released.

=== modified file 'configure.in'
--- a/configure.in      2012-06-01 09:51:00 +0000
+++ b/configure.in      2012-06-21 19:42:32 +0000
@@ -749,6 +749,7 @@
     machine=intel386
     machfile="m/${machine}.h"
   fi
+  AC_CHECK_DECL([__ILP32__], [machfile="m/intel386.h"])
 fi
 
 AC_PATH_PROG(INSTALL_INFO, install-info)