Provide a means to track the dependencies of files created by

`configure'.

* acgeneral.m4 (AT_FILE_DEPENDENCY, _AC_CONFIG_DEPENDENCY,
_AC_CONFIG_DEPENDENCIES): New macros.
(AC_CONFIG_FILES, AC_CONFIG_HEADERS, AC_CONFIG_LINKS): Use them.

diff --git a/ChangeLog b/ChangeLog
index ffee01c60d74a75d60b03edd8924981475d9a1a4..b7f2622f45ce2edeb9e8803366aca1062f8cf081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-11  Akim Demaille  <akim@epita.fr>
+
+       Provide a means to track the dependencies of files created by
+       `configure'.
+
+       * acgeneral.m4 (AT_FILE_DEPENDENCY, _AC_CONFIG_DEPENDENCY,
+       _AC_CONFIG_DEPENDENCIES): New macros.
+       (AC_CONFIG_FILES, AC_CONFIG_HEADERS, AC_CONFIG_LINKS): Use them.
+
 2000-05-11  Akim Demaille  <akim@epita.fr>
 
        Merge AC_DECL_YYTEXT into AC_PROG_LEX.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 28f1c90b96ebf2cb015d41918d23410847d0dd97..545dabb36bc949fce40024ed08a7addb28572b9f 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3451,6 +3451,34 @@ define(AC_CONFIG_IF_MEMBER,
         -1, [$4], [$3])])
 
 
+# AT_FILE_DEPENDENCY(DEST, SOURCE1, [SOURCE2...])
+# -----------------------------------------------
+# This macro does nothing, it's a hook to be read with `autoconf --trace'.
+# It announces DEST depends upon the SOURCE1 etc.
+define([AT_FILE_DEPENDENCY], [])
+
+
+# _AC_CONFIG_DEPENDENCY(DEST, [SOURCE1], [SOURCE2...])
+# ----------------------------------------------------
+# Be sure that a missing dependency is expressed as a dependency upon
+# `DEST.in'.
+define([_AC_CONFIG_DEPENDENCY],
+[ifval([$2],
+       [AT_FILE_DEPENDENCY($@)],
+       [AT_FILE_DEPENDENCY([$1], [$1.in])])])
+
+
+# _AC_CONFIG_DEPENDENCIES(DEST[:SOURCE1[:SOURCE2...]]...)
+# -------------------------------------------------------
+# Declare the DESTs depend upon their SOURCE1 etc.
+define([_AC_CONFIG_DEPENDENCIES],
+[AC_DIVERT_PUSH([KILL])
+AC_FOREACH([AC_File], [$1],
+  [_AC_CONFIG_DEPENDENCY(patsubst(AC_File, [:], [,]))])
+AC_DIVERT_POP()dnl
+])
+
+
 # _AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
 # -----------------------------------
 #
@@ -3582,6 +3610,7 @@ define([AC_OUTPUT_COMMANDS_POST])
 AC_DEFUN([AC_CONFIG_HEADERS],
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 m4_append([AC_LIST_HEADERS], [ $1])
 dnl Register the commands
 ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
@@ -3615,6 +3644,7 @@ AC_DEFUN(AC_CONFIG_HEADER,
 AC_DEFUN(AC_CONFIG_LINKS,
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 ifelse(regexp([$1], [^\.:\| \.:]), -1,,
        [AC_FATAL([$0: invalid destination: `.'])])
 m4_append([AC_LIST_LINKS], [ $1])
@@ -3688,6 +3718,7 @@ m4_namespace_define(autoupdate,
 AC_DEFUN([AC_CONFIG_FILES],
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 m4_append([AC_LIST_FILES], [ $1])
 dnl Register the commands.
 ifelse([$2],,, [AC_FOREACH([AC_File], [$1],

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 28f1c90b96ebf2cb015d41918d23410847d0dd97..545dabb36bc949fce40024ed08a7addb28572b9f 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3451,6 +3451,34 @@ define(AC_CONFIG_IF_MEMBER,
         -1, [$4], [$3])])
 
 
+# AT_FILE_DEPENDENCY(DEST, SOURCE1, [SOURCE2...])
+# -----------------------------------------------
+# This macro does nothing, it's a hook to be read with `autoconf --trace'.
+# It announces DEST depends upon the SOURCE1 etc.
+define([AT_FILE_DEPENDENCY], [])
+
+
+# _AC_CONFIG_DEPENDENCY(DEST, [SOURCE1], [SOURCE2...])
+# ----------------------------------------------------
+# Be sure that a missing dependency is expressed as a dependency upon
+# `DEST.in'.
+define([_AC_CONFIG_DEPENDENCY],
+[ifval([$2],
+       [AT_FILE_DEPENDENCY($@)],
+       [AT_FILE_DEPENDENCY([$1], [$1.in])])])
+
+
+# _AC_CONFIG_DEPENDENCIES(DEST[:SOURCE1[:SOURCE2...]]...)
+# -------------------------------------------------------
+# Declare the DESTs depend upon their SOURCE1 etc.
+define([_AC_CONFIG_DEPENDENCIES],
+[AC_DIVERT_PUSH([KILL])
+AC_FOREACH([AC_File], [$1],
+  [_AC_CONFIG_DEPENDENCY(patsubst(AC_File, [:], [,]))])
+AC_DIVERT_POP()dnl
+])
+
+
 # _AC_CONFIG_UNIQUE(DEST[:SOURCE]...)
 # -----------------------------------
 #
@@ -3582,6 +3610,7 @@ define([AC_OUTPUT_COMMANDS_POST])
 AC_DEFUN([AC_CONFIG_HEADERS],
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 m4_append([AC_LIST_HEADERS], [ $1])
 dnl Register the commands
 ifelse([$2],,, [AC_FOREACH([AC_File], [$1],
@@ -3615,6 +3644,7 @@ AC_DEFUN(AC_CONFIG_HEADER,
 AC_DEFUN(AC_CONFIG_LINKS,
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 ifelse(regexp([$1], [^\.:\| \.:]), -1,,
        [AC_FATAL([$0: invalid destination: `.'])])
 m4_append([AC_LIST_LINKS], [ $1])
@@ -3688,6 +3718,7 @@ m4_namespace_define(autoupdate,
 AC_DEFUN([AC_CONFIG_FILES],
 [AC_DIVERT_PUSH([KILL])
 _AC_CONFIG_UNIQUE([$1])
+_AC_CONFIG_DEPENDENCIES([$1])
 m4_append([AC_LIST_FILES], [ $1])
 dnl Register the commands.
 ifelse([$2],,, [AC_FOREACH([AC_File], [$1],