From c40f944923911b5d7c8f26814a97e2802d4e047c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 28 Apr 2010 00:20:39 -0700 Subject: [PATCH] Define CYGWIN_OBJ with configure, not cpp. * configure.in (CYGWIN_OBJ): New output variable. * src/Makefile.in (CYGWIN_OBJ): Set with configure, not cpp. --- ChangeLog | 2 ++ configure.in | 3 +++ src/ChangeLog | 2 ++ src/Makefile.in | 7 +++---- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3dff879491..464049bb0da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-04-28 Glenn Morris + * configure.in (CYGWIN_OBJ): New output variable. + * configure.in (GPM_MOUSE_SUPPORT): New output variable. * configure.in (FONT_OBJ): New output variable. diff --git a/configure.in b/configure.in index f283290f580..e3f14b3282b 100644 --- a/configure.in +++ b/configure.in @@ -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, diff --git a/src/ChangeLog b/src/ChangeLog index 4c974495a2f..d8c927b89e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-04-28 Glenn Morris + * 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. diff --git a/src/Makefile.in b/src/Makefile.in index ca6a6acd955..bb45ad0b19d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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@/ -- 2.39.2