From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Fri, 16 Oct 2009 03:08:41 +0000 (+0000)
Subject: (NS_HAVE_NSINTEGER): Back out previous change.  (*-apple-darwin*): Add x86_64 archite... 
X-Git-Tag: emacs-pretest-23.1.90~784
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5b30dc9b6c1470626299bcc0610867a538859c0;p=emacs.git

(NS_HAVE_NSINTEGER): Back out previous change.  (*-apple-darwin*): Add x86_64 architecture.
---

diff --git a/ChangeLog b/ChangeLog
index 895471fd754..cbe7a645393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-15  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* configure.in (NS_HAVE_NSINTEGER): Back out previous change.
+	(*-apple-darwin*): Add x86_64 architecture.
+
 2009-10-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* config.guess, config.sub: Updated from master source.
diff --git a/configure.in b/configure.in
index ce18111f8b0..a9e4c54bb5e 100644
--- a/configure.in
+++ b/configure.in
@@ -456,6 +456,7 @@ dnl see the `changequote' comment above.
     case "${canonical}" in
       i[3456]86-* )  machine=intel386 ;;
       powerpc-* )    machine=macppc ;;
+      x86_64-* )     machine=amdx86-64 ;;
       * )            unported=yes ;;
     esac
     opsys=darwin
@@ -1339,6 +1340,14 @@ if test "${with_ns}" != no; then
   AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
   		  [AC_MSG_ERROR([`--with-ns' was specified, but the include
   files are missing or cannot be compiled.])])
+  NS_HAVE_NSINTEGER=yes
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>],
+                                     [NSInteger i;])],
+		    ns_have_nsinteger=yes,
+		    ns_have_nsinteger=no)
+  if test $ns_have_nsinteger = no; then
+    NS_HAVE_NSINTEGER=no
+  fi
 fi
 if test "${HAVE_NS}" = yes; then
   window_system=nextstep