[Emacs-diffs] /srv/bzr/emacs/trunk r100102: Rework previous autoconf changes, hopefully to make clearer.

[Glenn Morris]

------------------------------------------------------------
revno: 100102
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-30 20:04:51 -0700
message:
  Rework previous autoconf changes, hopefully to make clearer.
  
  * configure.in (OTHER_OBJ): Remove.
  (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
  
  * configure: Regenerate.
  
  * src/Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
  for clarity.
  (OTHER_OBJ): Remove.
  (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
  (otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
modified:
  ChangeLog
  configure
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-30 16:37:01 +0000
+++ b/ChangeLog 2010-05-01 03:04:51 +0000
@@ -1,3 +1,8 @@
+2010-05-01  Glenn Morris  <address@hidden>
+
+       * configure.in (OTHER_OBJ): Remove.
+       (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
+
 2010-04-30  Glenn Morris  <address@hidden>
 
        * configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.

=== modified file 'configure'
--- a/configure 2010-04-30 16:37:01 +0000
+++ b/configure 2010-05-01 03:04:51 +0000
@@ -802,7 +802,8 @@
 OLDXMENU
 LIBXMENU
 CYGWIN_OBJ
-OTHER_OBJ
+PRE_ALLOC_OBJ
+POST_ALLOC_OBJ
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
@@ -26166,14 +26167,15 @@
 fi
 
 
-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 vm-limit.o"
+  PRE_ALLOC_OBJ=
+  POST_ALLOC_OBJ="lastfile.o vm-limit.o"
 else
   CYGWIN_OBJ=
-  OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)"
+  PRE_ALLOC_OBJ=lastfile.o
+  POST_ALLOC_OBJ="\$(vmlimitobj)"
 fi
 
 
@@ -26182,6 +26184,7 @@
 
 
 
+
 #### Report on what we decided to do.
 #### Report GTK as a toolkit, even if it doesn't use Xt.
 #### It makes printing result more understandable as using GTK sets

=== modified file 'configure.in'
--- a/configure.in      2010-04-30 16:37:01 +0000
+++ b/configure.in      2010-05-01 03:04:51 +0000
@@ -2952,17 +2952,19 @@
 fi
 
 
-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 vm-limit.o"
+  PRE_ALLOC_OBJ=
+  POST_ALLOC_OBJ="lastfile.o vm-limit.o"
 else
   CYGWIN_OBJ=
-  OTHER_OBJ="lastfile.o $OTHER_OBJ \$(vmlimitobj)"
+  PRE_ALLOC_OBJ=lastfile.o
+  POST_ALLOC_OBJ="\$(vmlimitobj)"
 fi
 AC_SUBST(CYGWIN_OBJ)
-AC_SUBST(OTHER_OBJ)
+AC_SUBST(PRE_ALLOC_OBJ)
+AC_SUBST(POST_ALLOC_OBJ)
 
 AH_TOP([/* GNU Emacs site configuration template file.
    Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-01 02:58:41 +0000
+++ b/src/ChangeLog     2010-05-01 03:04:51 +0000
@@ -1,3 +1,11 @@
+2010-05-01  Glenn Morris  <address@hidden>
+
+       * Makefile.in (gmallocobj, rallocobj, vmlimitobj): Initialize to null,
+       for clarity.
+       (OTHER_OBJ): Remove.
+       (PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New, set by configure.
+       (otherobj): Use PRE_ALLOC_OBJ, POST_ALLOC_OBJ rather than OTHER_OBJ.
+
 2010-05-01  Karel Klíč  <address@hidden>
 
        * fileio.c (Ffile_selinux_context): Context functions may return null.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-30 16:37:01 +0000
+++ b/src/Makefile.in   2010-05-01 03:04:51 +0000
@@ -411,7 +411,9 @@
 termcapobj = tparam.o
 #endif /* ! defined (TERMINFO) */
 
-
+gmallocobj =
+rallocobj =
+vmlimitobj =
 #ifndef SYSTEM_MALLOC
 #ifndef DOUG_LEA_MALLOC
 gmallocobj = gmalloc.o
@@ -424,10 +426,14 @@
 vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
address@hidden@
+## Empty on Cygwin, lastfile.o elsewhere.
address@hidden@
+## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.
address@hidden@
 
 /* List of object files that make-docfile should not be told about.  */
-otherobj= $(termcapobj) $(OTHER_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
+otherobj= $(termcapobj) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
+  $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 #ifdef HAVE_MOUSE
 #define MOUSE_SUPPORT ${lispsource}mouse.elc \