* lib/autoconf/general.m4 (AC_REQUIRE_AUX_FILE): New empty macro.

(AC_CANONICAL_BUILD): Call it to require config.sub and config.guess.
* lib/autoconf/programs.m4 (AC_PROG_INSTALL): Likewise for install-sh.
* doc/autoconf.texi (Input): Document AC_REQUIRE_AUX_FILE.
* lib/autom4te.in (Automake-preselections): Preselect
AC_REQUIRE_AUX_FILE.  Automake 1.10 will trace it.

diff --git a/ChangeLog b/ChangeLog
index f043da2d01bd7f1e2097e3765befe6b235673695..83442615c0d9acfb521f51c57909c32809fdb38a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-04  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/autoconf/general.m4 (AC_REQUIRE_AUX_FILE): New empty macro.
+       (AC_CANONICAL_BUILD): Call it to require config.sub and config.guess.
+       * lib/autoconf/programs.m4 (AC_PROG_INSTALL): Likewise for install-sh.
+       * doc/autoconf.texi (Input): Document AC_REQUIRE_AUX_FILE.
+       * lib/autom4te.in (Automake-preselections): Preselect
+       AC_REQUIRE_AUX_FILE.  Automake 1.10 will trace it.
+
 2004-08-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/autom4te.in (Automake-preselections): Preselect

diff --git a/NEWS b/NEWS
index f51b52766f54ede8fa6ceb56651f3157f627b1bd..42648729eb7bbd1af4b40987d38f1527cea538e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@
   New macros that detect programs whose name is prefixed with the
   target type, if the build type and target type are different.
 
+** AC_REQUIRE_AUX_FILE
+  New trace macro that declares expected auxiliary files.
+
 * Major changes in Autoconf 2.59a
 
 ** AC_PROG_GREP

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 0f6df777a4fa920218e15b8c0d12296fc1f497c3..1904db8284bca241ff1a199ea7b7403bd5a3ed14 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1765,6 +1765,16 @@ The auxiliary directory should not be named @file{aux} for portability
 to MS-DOS, because the filename @file{aux} is reserved under MS-DOS.
 @end defmac
 
+@defmac AC_REQUIRE_AUX_FILE (@var{file})
+@acindex{REQUIRE_AUX_FILE}
+Declares that @var{file} is expected in the directory defined above.  In
+Autoconf proper, this macro does nothing: its sole purpose is to be
+traced by third-party tools to produce a list of expected auxiliary
+files.  For instance it is called by macros like @code{AC_PROG_INSTALL}
+(@pxref{Particular Programs}) or @code{AC_CANONICAL_BUILD}
+(@pxref{Canonicalizing}) to register the auxiliary files they need.
+@end defmac
+
 Similarly, packages that use @command{aclocal} should declare where
 local macros can be found using @code{AC_CONFIG_MACRO_DIR}.
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 37c3eb50fa7cbe92638b9d50851c01c21e33af60..c388560bf55231dcc1996fcf3c9d718b22936ed2 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1563,6 +1563,19 @@ fi
 
 
 
+## --------------------- ##
+## Requiring aux files.  ##
+## --------------------- ##
+
+# AC_REQUIRE_AUX_FILE(FILE)
+# -------------------------
+# This macro does nothing, it's a hook to be read with `autoconf --trace'.
+# It announces FILE is required in the auxdir.
+m4_define([AC_REQUIRE_AUX_FILE],
+[AS_LITERAL_IF([$1], [],
+               [AC_FATAL([$0: requires a literal argument])])])
+
+
 
 ## ----------------------------------- ##
 ## Getting the canonical system type.  ##
@@ -1596,6 +1609,8 @@ AC_SUBST([$1_os],
 # ------------------
 AC_DEFUN_ONCE([AC_CANONICAL_BUILD],
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_REQUIRE_AUX_FILE([config.sub])dnl
+AC_REQUIRE_AUX_FILE([config.guess])dnl
 m4_divert_text([HELP_CANON],
 [[
 System types:

diff --git a/lib/autoconf/programs.m4 b/lib/autoconf/programs.m4
index af1ca8f95349ca0cdba8ef241d6a674fe8e64f0a..1ddee7aa96e548f7ae6875d094b4f55a340a8120 100644 (file)
--- a/lib/autoconf/programs.m4
+++ b/lib/autoconf/programs.m4
@@ -512,6 +512,7 @@ AN_MAKEVAR([INSTALL], [AC_PROG_INSTALL])
 AN_PROGRAM([install], [AC_PROG_INSTALL])
 AC_DEFUN([AC_PROG_INSTALL],
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_REQUIRE_AUX_FILE([install-sh])dnl
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:

diff --git a/lib/autom4te.in b/lib/autom4te.in
index 4a918777e009419f2aba0c9b3d519901fbc41e83..dc67126289ebfb132da944094586a949e4d5ddab 100644 (file)
--- a/lib/autom4te.in
+++ b/lib/autom4te.in
@@ -48,6 +48,7 @@ args: --preselect AC_CONFIG_LIBOBJ_DIR
 args: --preselect AC_CONFIG_LINKS
 args: --preselect AC_INIT
 args: --preselect AC_LIBSOURCE
+args: --preselect AC_REQUIRE_AUX_FILE
 args: --preselect AC_SUBST
 args: --preselect AM_AUTOMAKE_VERSION
 args: --preselect AM_CONDITIONAL