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.

2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 544e71504d2..08a4595e695 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index 9d60e403cf1..cc7b1477d35 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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 \