From: Glenn Morris <rgm@gnu.org>
Date: Mon, 16 Apr 2012 19:13:44 +0000 (-0400)
Subject: * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
X-Git-Tag: emacs-24.2.90~471^2~352^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1aa797c7a2dbb910c9bd59c1d1e647bfe9a9d85;p=emacs.git

* configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
---

diff --git a/ChangeLog b/ChangeLog
index fb0ce63727b..8d551e06f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-04-16  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
+
 	* configure.in: Remove X libs workaround for old autoconf.
 
 2012-04-12  Ken Brown  <kbrown@cornell.edu>
diff --git a/configure.in b/configure.in
index e0ac2ab1bad..fd1327ed2a9 100644
--- a/configure.in
+++ b/configure.in
@@ -1541,13 +1541,12 @@ fail;
   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
+  if test $ns_have_nsinteger = yes; then
+    AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
   fi
 fi
 AC_SUBST(TEMACS_LDFLAGS2)
@@ -2595,9 +2594,6 @@ if test "${HAVE_NS}" = "yes"; then
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
-  if test "${NS_HAVE_NSINTEGER}" = "yes"; then
-    AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
-  fi
   # We also have mouse menus.
   HAVE_MENUS=yes
   OTHER_FILES=ns-app