Mercurial > emacs
changeset 108176:e6f59a2ba110
Hopefully fix bug#6065.
* configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
Elsewhere, maybe include it.
* src/Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.
(OTHER_OBJ): Define as a separate variable, for clarity.
* configure: Regenerate.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 30 Apr 2010 09:37:01 -0700 |
| parents | c9cc3dd13301 |
| children | 35378c29749d |
| files | ChangeLog configure configure.in src/ChangeLog src/Makefile.in |
| diffstat | 5 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 30 15:50:34 2010 +0200 +++ b/ChangeLog Fri Apr 30 09:37:01 2010 -0700 @@ -1,5 +1,8 @@ 2010-04-30 Glenn Morris <rgm@gnu.org> + * configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin. + Elsewhere, maybe include it. + * configure.in (TOOLKIT_LIBW) [HAVE_GTK]: Set to $GTK_LIBS. (OLDXMENU, LIBXMENU): New output variables.
--- a/configure Fri Apr 30 15:50:34 2010 +0200 +++ b/configure Fri Apr 30 09:37:01 2010 -0700 @@ -26170,10 +26170,10 @@ if test "$opsys" = "cygwin"; then CYGWIN_OBJ="sheap.o" ## Cygwin differs because of its unexec(). - OTHER_OBJ="$OTHER_OBJ lastfile.o" + OTHER_OBJ="$OTHER_OBJ lastfile.o vm-limit.o" else CYGWIN_OBJ= - OTHER_OBJ="lastfile.o $OTHER_OBJ" + OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)" fi
--- a/configure.in Fri Apr 30 15:50:34 2010 +0200 +++ b/configure.in Fri Apr 30 09:37:01 2010 -0700 @@ -2956,10 +2956,10 @@ if test "$opsys" = "cygwin"; then CYGWIN_OBJ="sheap.o" ## Cygwin differs because of its unexec(). - OTHER_OBJ="$OTHER_OBJ lastfile.o" + OTHER_OBJ="$OTHER_OBJ lastfile.o vm-limit.o" else CYGWIN_OBJ= - OTHER_OBJ="lastfile.o $OTHER_OBJ" + OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)" fi AC_SUBST(CYGWIN_OBJ) AC_SUBST(OTHER_OBJ)
--- a/src/ChangeLog Fri Apr 30 15:50:34 2010 +0200 +++ b/src/ChangeLog Fri Apr 30 09:37:01 2010 -0700 @@ -1,3 +1,8 @@ +2010-04-30 Glenn Morris <rgm@gnu.org> + + * Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable. (Bug#6065) + (OTHER_OBJ): Define as a separate variable, for clarity. + 2010-04-30 Jan Djärv <jan.h.d@swipnet.se> * xsettings.c: include limits.h and update file comment.
--- a/src/Makefile.in Fri Apr 30 15:50:34 2010 +0200 +++ b/src/Makefile.in Fri Apr 30 09:37:01 2010 -0700 @@ -420,12 +420,14 @@ #ifdef REL_ALLOC rallocobj = ralloc.o #endif + +vmlimitobj = vm-limit.o #endif /* !SYSTEM_MALLOC */ +OTHER_OBJ=@OTHER_OBJ@ + /* List of object files that make-docfile should not be told about. */ -/* OTHER_OBJ = $(gmallocobj) $(rallocobj), with trailing/leading - lastfile.o on Cygwin/other. */ -otherobj= $(termcapobj) @OTHER_OBJ@ vm-limit.o $(WIDGET_OBJ) $(LIBOBJS) +otherobj= $(termcapobj) $(OTHER_OBJ) $(WIDGET_OBJ) $(LIBOBJS) #ifdef HAVE_MOUSE #define MOUSE_SUPPORT ${lispsource}mouse.elc \