aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-16 15:13:44 -0400
committerGlenn Morris2012-04-16 15:13:44 -0400
commitb1aa797c7a2dbb910c9bd59c1d1e647bfe9a9d85 (patch)
tree4995a5a9edd38edf7485c237df5424a9c2715e3d
parent5261b92ebe71d21e8d36f65f4555a1f90c088281 (diff)
downloademacs-b1aa797c7a2dbb910c9bd59c1d1e647bfe9a9d85.tar.gz
emacs-b1aa797c7a2dbb910c9bd59c1d1e647bfe9a9d85.zip
* configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
-rw-r--r--ChangeLog2
-rw-r--r--configure.in8
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fb0ce63727b..8d551e06f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12012-04-16 Glenn Morris <rgm@gnu.org> 12012-04-16 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.in (NS_HAVE_NSINTEGER): Remove unnecessary variable.
4
3 * configure.in: Remove X libs workaround for old autoconf. 5 * configure.in: Remove X libs workaround for old autoconf.
4 6
52012-04-12 Ken Brown <kbrown@cornell.edu> 72012-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;
1541 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], 1541 AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
1542 [AC_MSG_ERROR([`--with-ns' was specified, but the include 1542 [AC_MSG_ERROR([`--with-ns' was specified, but the include
1543 files are missing or cannot be compiled.])]) 1543 files are missing or cannot be compiled.])])
1544 NS_HAVE_NSINTEGER=yes
1545 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>], 1544 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>],
1546 [NSInteger i;])], 1545 [NSInteger i;])],
1547 ns_have_nsinteger=yes, 1546 ns_have_nsinteger=yes,
1548 ns_have_nsinteger=no) 1547 ns_have_nsinteger=no)
1549 if test $ns_have_nsinteger = no; then 1548 if test $ns_have_nsinteger = yes; then
1550 NS_HAVE_NSINTEGER=no 1549 AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
1551 fi 1550 fi
1552fi 1551fi
1553AC_SUBST(TEMACS_LDFLAGS2) 1552AC_SUBST(TEMACS_LDFLAGS2)
@@ -2595,9 +2594,6 @@ if test "${HAVE_NS}" = "yes"; then
2595 ## Extra CFLAGS applied to src/*.m files. 2594 ## Extra CFLAGS applied to src/*.m files.
2596 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" 2595 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"
2597 fi 2596 fi
2598 if test "${NS_HAVE_NSINTEGER}" = "yes"; then
2599 AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
2600 fi
2601 # We also have mouse menus. 2597 # We also have mouse menus.
2602 HAVE_MENUS=yes 2598 HAVE_MENUS=yes
2603 OTHER_FILES=ns-app 2599 OTHER_FILES=ns-app