From e6ec4e99210e02fddacec7ec9badc48f5db08272 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 27 Apr 2010 23:54:25 -0700
Subject: [PATCH] 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.

---
 ChangeLog       |  2 ++
 configure.in    |  7 +++++++
 src/ChangeLog   |  2 ++
 src/Makefile.in | 15 ++++-----------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddd52e9724d..cb0100cd488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+	* 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).
 
diff --git a/configure.in b/configure.in
index 6233b7fe730..f7e03df4cdb 100644
--- a/configure.in
+++ b/configure.in
@@ -1404,6 +1404,9 @@ if test "${with_ns}" != no; then
     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 "${HAVE_NS}" = yes; then
   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 )
diff --git a/src/ChangeLog b/src/ChangeLog
index 041ea278974..283507680de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+	* 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  <rgm@gnu.org>
diff --git a/src/Makefile.in b/src/Makefile.in
index 9e505741524..15cb6fed79c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -104,6 +104,9 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
 ## widget.o if USE_X_TOOLKIT, otherwise empty.
 WIDGET_OBJ=@WIDGET_OBJ@
 
+NS_OBJ=@NS_OBJ@
+NS_SUPPORT=@NS_SUPPORT@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -369,9 +372,6 @@ ns_appdir=@ns_appdir@/
 ns_appbindir=@ns_appbindir@/
 ns_appresdir=@ns_appresdir@/
 ns_appsrc=@ns_appsrc@
-/* 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 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS)
 #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 @@ lisp= \
 	MSDOS_SUPPORT \
 	WINNT_SUPPORT \
 	WINDOW_SUPPORT \
-	NS_SUPPORT \
+	${NS_SUPPORT} \
 	${lispsource}widget.elc \
 	${lispsource}window.elc \
 	${lispsource}version.el
-- 
2.39.2