From 7acac9f4ce1b49c8d953b80b83c4ecd7dd919676 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Fri, 30 Apr 2010 20:04:51 -0700
Subject: [PATCH] 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.
---
 ChangeLog       |  5 +++++
 configure       | 11 +++++++----
 configure.in    | 10 ++++++----
 src/ChangeLog   |  8 ++++++++
 src/Makefile.in | 12 +++++++++---
 5 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 638475e92b6..279b3a00157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in (OTHER_OBJ): Remove.
+	(PRE_ALLOC_OBJ, POST_ALLOC_OBJ): New output variables.
+
 2010-04-30  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin.
diff --git a/configure b/configure
index 6183da28e18..81d7e258e21 100755
--- a/configure
+++ b/configure
@@ -802,7 +802,8 @@ TOOLKIT_LIBW
 OLDXMENU
 LIBXMENU
 CYGWIN_OBJ
-OTHER_OBJ
+PRE_ALLOC_OBJ
+POST_ALLOC_OBJ
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
@@ -26166,14 +26167,15 @@ _ACEOF
 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 @@ fi
 
 
 
+
 #### 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
diff --git a/configure.in b/configure.in
index 4ad31ce4b59..a77264ab4dc 100644
--- a/configure.in
+++ b/configure.in
@@ -2952,17 +2952,19 @@ if test "${REL_ALLOC}" = "yes" ; then
 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,
diff --git a/src/ChangeLog b/src/ChangeLog
index 3f6a45a4118..e5c6a0b23b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-01  Glenn Morris  <rgm@gnu.org>
+
+	* 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íč  <kklic@redhat.com>
 
 	* fileio.c (Ffile_selinux_context): Context functions may return null.
diff --git a/src/Makefile.in b/src/Makefile.in
index cc7b1477d35..e221c4a5934 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -411,7 +411,9 @@ termcapobj = terminfo.o
 termcapobj = tparam.o
 #endif /* ! defined (TERMINFO) */
 
-
+gmallocobj =
+rallocobj =
+vmlimitobj =
 #ifndef SYSTEM_MALLOC
 #ifndef DOUG_LEA_MALLOC
 gmallocobj = gmalloc.o
@@ -424,10 +426,14 @@ rallocobj = ralloc.o
 vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
-OTHER_OBJ=@OTHER_OBJ@
+## Empty on Cygwin, lastfile.o elsewhere.
+PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
+## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere.
+POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* 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 \
-- 
2.39.2