Mercurial > emacs
changeset 108151:582ce1d4716e
Define CYGWIN_OBJ with configure, not cpp.
* configure.in (CYGWIN_OBJ): New output variable.
* src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 28 Apr 2010 00:20:39 -0700 |
| parents | 66c73788b432 |
| children | ad916afa5bdd |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Apr 28 00:15:10 2010 -0700 +++ b/ChangeLog Wed Apr 28 00:20:39 2010 -0700 @@ -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.
--- a/configure.in Wed Apr 28 00:15:10 2010 -0700 +++ b/configure.in Wed Apr 28 00:20:39 2010 -0700 @@ -2928,6 +2928,9 @@ 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,
--- a/src/ChangeLog Wed Apr 28 00:15:10 2010 -0700 +++ b/src/ChangeLog Wed Apr 28 00:20:39 2010 -0700 @@ -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.
--- a/src/Makefile.in Wed Apr 28 00:15:10 2010 -0700 +++ b/src/Makefile.in Wed Apr 28 00:20:39 2010 -0700 @@ -106,6 +106,9 @@ ## 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 @@ #endif #endif -#ifdef CYGWIN -CYGWIN_OBJ = sheap.o -#endif - #ifdef HAVE_NS ns_appdir=@ns_appdir@/ ns_appbindir=@ns_appbindir@/