From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 14 May 2005 18:33:30 +0000 (+0000)
Subject: * lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA): Prepend ${LIBOBJDIR},
X-Git-Tag: AUTOCONF-2.59c~387
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f41ecbc9006d6ea862530cc2f9f0b280a8405c8;p=thirdparty%2Fautoconf.git

* lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA): Prepend ${LIBOBJDIR},
as on 2005-05-02.
* doc/autoconf.texi (Particular Functions) <AC_FUNC_ALLOCA>:
Mention LIBOBJDIR.
---

diff --git a/ChangeLog b/ChangeLog
index 0c7c01595..c6b256644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-14  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* lib/autoconf/functions.m4 (_AC_LIBOBJ_ALLOCA): Prepend ${LIBOBJDIR},
+	as on 2005-05-02.
+	* doc/autoconf.texi (Particular Functions) <AC_FUNC_ALLOCA>:
+	Mention LIBOBJDIR.
+
 2005-05-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* AUTHORS, BUGS, COPYING, ChangeLog, ChangeLog.0, ChangeLog.1,
diff --git a/NEWS b/NEWS
index da98a55ce..6f7e9ac53 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,10 @@
     infodir       info documentation [DATAROOTDIR/info]
     mandir        man documentation [DATAROOTDIR/man]
 
+  This means that if you use any of `@datadir@', `@infodir@', or
+  `@mandir@' in a file, you will have to ensure `${datarootdir}' is
+  defined in this file.
+
 ** AC_PROG_CC_C89, AC_PROG_CC_C99
   New macros for ISO C99 support.  AC_PROG_CC_C89 and AC_PROG_CC_C99
   check for ANSI C89 and ISO C99 support respectively.
@@ -41,6 +45,11 @@
 ** AT_COPYRIGHT
   New macro for copyright notices in testsuite files.
 
+** ALLOCA, LIBOBJS, LTLIBOBJS
+  Object names added to these variables are now prefixed with `${LIBOBJDIR}',
+  as in `${LIBOBJDIR}alloca.o'.  LIBOBJDIR is meant to be defined from
+  `Makefile.in' in case the object files lie in a different directory.
+
 * Major changes in Autoconf 2.59b
 
   Released 2004-08-20, by Paul Eggert.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index aaf5a4081..7b5f12b16 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -3989,11 +3989,13 @@ it defines @code{HAVE_ALLOCA_H}.
 If those attempts fail, it looks for the function in the standard C
 library.  If any of those methods succeed, it defines
 @code{HAVE_ALLOCA}.  Otherwise, it sets the output variable
-@code{ALLOCA} to @samp{alloca.o} and defines @code{C_ALLOCA} (so
-programs can periodically call @samp{alloca(0)} to garbage collect).
-This variable is separate from @code{LIBOBJS} so multiple programs can
-share the value of @code{ALLOCA} without needing to create an actual
-library, in case only some of them use the code in @code{LIBOBJS}.
+@code{ALLOCA} to @samp{$@{LIBOBJDIR@}alloca.o} and defines
+@code{C_ALLOCA} (so programs can periodically call @samp{alloca(0)} to
+garbage collect).  This variable is separate from @code{LIBOBJS} so
+multiple programs can share the value of @code{ALLOCA} without needing
+to create an actual library, in case only some of them use the code in
+@code{LIBOBJS}.  The @samp{$@{LIBOBJDIR@}} prefix serves the same
+purpose as in @code{LIBOBJS} (@pxref{AC_LIBOBJ vs LIBOBJS}).
 
 This macro does not try to get @code{alloca} from the System V R3
 @file{libPW} or the System V R4 @file{libucb} because those libraries
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 57fb45852..40e0f7c98 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -254,7 +254,7 @@ m4_define([_AC_LIBOBJ_ALLOCA],
 # contain a buggy version.  If you still want to use their alloca,
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 AC_LIBSOURCES(alloca.c)
-AC_SUBST(ALLOCA, alloca.$ac_objext)dnl
+AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
 AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
 
 AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,