Commit 5a1bb006 authored by Glenn Morris's avatar Glenn Morris

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.
parent 210af043
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.
......
......@@ -26170,10 +26170,10 @@ OTHER_OBJ="\$(gmallocobj) \$(rallocobj)"
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
......
......@@ -2956,10 +2956,10 @@ OTHER_OBJ="\$(gmallocobj) \$(rallocobj)"
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)
......
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.
......
......@@ -420,12 +420,14 @@ gmallocobj = gmalloc.o
#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 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment