[Emacs-diffs] /srv/bzr/emacs/trunk r100093: Hopefully fix bug#6065.

[Glenn Morris]

------------------------------------------------------------
revno: 100093
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-30 09:37:01 -0700
message:
  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.
modified:
  ChangeLog
  configure
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-30 01:50:17 +0000
+++ b/ChangeLog 2010-04-30 16:37:01 +0000
@@ -1,5 +1,8 @@
 2010-04-30  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'configure'
--- a/configure 2010-04-30 01:54:08 +0000
+++ b/configure 2010-04-30 16:37:01 +0000
@@ -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
 
 

=== modified file 'configure.in'
--- a/configure.in      2010-04-30 01:50:17 +0000
+++ b/configure.in      2010-04-30 16:37:01 +0000
@@ -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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-30 13:50:34 +0000
+++ b/src/ChangeLog     2010-04-30 16:37:01 +0000
@@ -1,3 +1,8 @@
+2010-04-30  Glenn Morris  <address@hidden>
+
+       * Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable.  (Bug#6065)
+       (OTHER_OBJ): Define as a separate variable, for clarity.
+
 2010-04-30  Jan Djärv  <address@hidden>
 
        * xsettings.c: include limits.h and update file comment.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-30 01:50:17 +0000
+++ b/src/Makefile.in   2010-04-30 16:37:01 +0000
@@ -420,12 +420,14 @@
 #ifdef REL_ALLOC
 rallocobj = ralloc.o
 #endif
+
+vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
address@hidden@
+
 /* 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 \