[Emacs-diffs] /srv/bzr/emacs/trunk r100068: Define CYGWIN_OBJ with configure, not cpp.

[Glenn Morris]

------------------------------------------------------------
revno: 100068
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-28 00:20:39 -0700
message:
  Define CYGWIN_OBJ with configure, not cpp.
  * configure.in (CYGWIN_OBJ): New output variable.
  * src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-28 07:15:10 +0000
+++ b/ChangeLog 2010-04-28 07:20:39 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * configure.in (CYGWIN_OBJ): New output variable.
+
        * configure.in (GPM_MOUSE_SUPPORT): New output variable.
 
        * configure.in (FONT_OBJ): New output variable.

=== modified file 'configure.in'
--- a/configure.in      2010-04-28 07:15:10 +0000
+++ b/configure.in      2010-04-28 07:20:39 +0000
@@ -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,

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 07:15:10 +0000
+++ b/src/ChangeLog     2010-04-28 07:20:39 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-28 07:15:10 +0000
+++ b/src/Makefile.in   2010-04-28 07:20:39 +0000
@@ -106,6 +106,9 @@
 ## widget.o if USE_X_TOOLKIT, otherwise empty.
 address@hidden@
 
+## sheap.o if CYGWIN, otherwise empty.
address@hidden@
+
 address@hidden@
 address@hidden@
 
@@ -368,10 +371,6 @@
 #endif
 #endif
 
-#ifdef CYGWIN
-CYGWIN_OBJ = sheap.o
-#endif
-
 #ifdef HAVE_NS
 address@hidden@/
 address@hidden@/