[Emacs-diffs] /srv/bzr/emacs/trunk r100064: Move NS_OBJ, NS_SUPPORT from cpp to configure.

[Glenn Morris]

------------------------------------------------------------
revno: 100064
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-27 23:54:25 -0700
message:
  Move NS_OBJ, NS_SUPPORT from cpp to configure.
  * configure.in (NS_OBJ, NS_SUPPORT): New output variables.
  * src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-28 06:43:38 +0000
+++ b/ChangeLog 2010-04-28 06:54:25 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * configure.in (NS_OBJ, NS_SUPPORT): New output variables.
+
        * configure.in (machine, canonical): On amdx86-64, check for a 32-bit
        userland and maybe change values to i386 (move test from s/amdx86-64.h).
 

=== modified file 'configure.in'
--- a/configure.in      2010-04-28 06:43:38 +0000
+++ b/configure.in      2010-04-28 06:54:25 +0000
@@ -1404,6 +1404,9 @@
     NS_HAVE_NSINTEGER=no
   fi
 fi
+
+NS_OBJ=
+NS_SUPPORT=
 if test "${HAVE_NS}" = yes; then
   window_system=nextstep
   with_xft=no
@@ -1413,9 +1416,13 @@
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
      prefix=${ns_appresdir}
   fi
+  NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o 
fringe.o image.o"
+  NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc 
\${lispsource}term/ns-win.elc"
 fi
 CFLAGS="$tmp_CFLAGS"
 CPPFLAGS="$tmp_CPPFLAGS"
+AC_SUBST(NS_OBJ)
+AC_SUBST(NS_SUPPORT)
 
 case "${window_system}" in
   x11 )

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 06:45:35 +0000
+++ b/src/ChangeLog     2010-04-28 06:54:25 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
+
        * m/amdx86-64.h [i386]: Move this test to configure.in.
 
 2010-04-27  Glenn Morris  <address@hidden>

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-27 08:09:01 +0000
+++ b/src/Makefile.in   2010-04-28 06:54:25 +0000
@@ -104,6 +104,9 @@
 ## widget.o if USE_X_TOOLKIT, otherwise empty.
 address@hidden@
 
address@hidden@
address@hidden@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -369,9 +372,6 @@
 address@hidden@/
 address@hidden@/
 address@hidden@
-/* Object files for NeXTstep */
-NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
-       fontset.o fringe.o image.o
 #endif  /* HAVE_NS */
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -504,13 +504,6 @@
 #define TOOLTIP_SUPPORT
 #endif
 
-#ifdef HAVE_NS
-#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \
-  ${lispsource}term/ns-win.elc
-#else
-#define NS_SUPPORT
-#endif
-
 /* This is the platform-specific list of Lisp files loaded into the
    dumped Emacs.  It is arranged like this because it is easier to generate
    it semi-mechanically from loadup.el this way.
@@ -611,7 +604,7 @@
        MSDOS_SUPPORT \
        WINNT_SUPPORT \
        WINDOW_SUPPORT \
-       NS_SUPPORT \
+       ${NS_SUPPORT} \
        ${lispsource}widget.elc \
        ${lispsource}window.elc \
        ${lispsource}version.el