1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 17:30:54 -08:00

Define CYGWIN_OBJ with configure, not cpp.

* configure.in (CYGWIN_OBJ): New output variable.
* src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
This commit is contained in:
Glenn Morris 2010-04-28 00:20:39 -07:00
parent 658f86ca32
commit c40f944923
4 changed files with 10 additions and 4 deletions

View file

@ -1,5 +1,7 @@
2010-04-28 Glenn Morris <rgm@gnu.org>
* configure.in (CYGWIN_OBJ): New output variable.
* configure.in (GPM_MOUSE_SUPPORT): New output variable.
* configure.in (FONT_OBJ): New output variable.

View file

@ -2928,6 +2928,9 @@ if test "${REL_ALLOC}" = "yes" ; then
buffer space.])
fi
CYGWIN_OBJ=
test "$opsys" = "cygwin" && CYGWIN_OBJ="sheap.o"
AC_SUBST(CYGWIN_OBJ)
AH_TOP([/* GNU Emacs site configuration template file.
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,

View file

@ -1,5 +1,7 @@
2010-04-28 Glenn Morris <rgm@gnu.org>
* Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
* Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
(MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.

View file

@ -106,6 +106,9 @@ RSVG_CFLAGS= @RSVG_CFLAGS@
## widget.o if USE_X_TOOLKIT, otherwise empty.
WIDGET_OBJ=@WIDGET_OBJ@
## sheap.o if CYGWIN, otherwise empty.
CYGWIN_OBJ=@CYGWIN_OBJ@
NS_OBJ=@NS_OBJ@
NS_SUPPORT=@NS_SUPPORT@
@ -368,10 +371,6 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o termcap.o
#endif
#endif
#ifdef CYGWIN
CYGWIN_OBJ = sheap.o
#endif
#ifdef HAVE_NS
ns_appdir=@ns_appdir@/
ns_appbindir=@ns_appbindir@/