procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move NS_OBJ, NS_SUPPORT from cpp to configure.

Browse source 
* configure.in (NS_OBJ, NS_SUPPORT): New output variables.
* src/Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp.
This commit is contained in:
Glenn Morris 2010-04-27 23:54:25 -07:00
parent f1e3642ad5
commit e6ec4e9921
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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).

7
configure.in
View file

@ -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 )

2
src/ChangeLog
View file

@ -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>

15
src/Makefile.in
View file

@ -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