[Emacs-diffs] /srv/bzr/emacs/trunk r107935: * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.

[Glenn Morris]

------------------------------------------------------------
revno: 107935
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-16 15:13:44 -0400
message:
  * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-16 18:32:59 +0000
+++ b/ChangeLog 2012-04-16 19:13:44 +0000
@@ -1,5 +1,7 @@
 2012-04-16  Glenn Morris  <address@hidden>
 
+       * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
+
        * configure.in: Remove X libs workaround for old autoconf.
 
 2012-04-12  Ken Brown  <address@hidden>

=== modified file 'configure.in'
--- a/configure.in      2012-04-16 18:32:59 +0000
+++ b/configure.in      2012-04-16 19:13:44 +0000
@@ -1541,13 +1541,12 @@
   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 @@
     ## 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