From: Glenn Morris <rgm@gnu.org>
Date: Fri, 30 Apr 2010 16:37:01 +0000 (-0700)
Subject: Hopefully fix bug#6065.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~331
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5a1bb006a3951ba7a721fb873855266dc2c75dcb;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 75b2a53ccd2..638475e92b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/configure b/configure
index f9c2134d62b..6183da28e18 100755
--- a/configure
+++ b/configure
@@ -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
 
 
diff --git a/configure.in b/configure.in
index ce232b18d35..4ad31ce4b59 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
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 \