Reversal of

2001-04-15  Lars J. Aas  <larsa@sim.no>

        * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Show options `--file'
        and `--header' unconditionally.

diff --git a/ChangeLog b/ChangeLog
index bb9899afe1a26d9d4608d04544c7f35d396e7b83..35afc96306cfee498c4091063f4827293032c3de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,11 +10,6 @@
         `config.status --version' to be more compliant with the GNU Coding
         Standards.
 
-2001-04-15  Lars J. Aas  <larsa@sim.no>
-
-       * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Show options `--file'
-       and `--header' unconditionally.
-
 2001-04-13  Steven G. Johnson  <stevenj@alum.mit.edu>
 
        * doc/autoconf.texi: Still more minor modifications for clarity,

diff --git a/acgeneral.m4 b/acgeneral.m4
index 46af809e9d6f46915a4a9617b807363204f69156..f46d036e11b78a10913d2815f4c9240283c7b4ae 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3653,10 +3653,14 @@ Usage: $[0] [[OPTIONS]] [[FILE]]...
   -V, --version    print version number, then exit
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[[:TEMPLATE]]
-                   instantiate a configuration file FILE
-  --header=FILE[[:TEMPLATE]]
-                   instantiate a configuration header FILE
+m4_ifset([AC_LIST_FILES],
+[[  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+]])dnl
+m4_ifset([AC_LIST_HEADERS],
+[[  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+]])dnl
 
 m4_ifset([AC_LIST_FILES],
 [Configuration files:

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 46af809e9d6f46915a4a9617b807363204f69156..f46d036e11b78a10913d2815f4c9240283c7b4ae 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3653,10 +3653,14 @@ Usage: $[0] [[OPTIONS]] [[FILE]]...
   -V, --version    print version number, then exit
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[[:TEMPLATE]]
-                   instantiate a configuration file FILE
-  --header=FILE[[:TEMPLATE]]
-                   instantiate a configuration header FILE
+m4_ifset([AC_LIST_FILES],
+[[  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+]])dnl
+m4_ifset([AC_LIST_HEADERS],
+[[  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+]])dnl
 
 m4_ifset([AC_LIST_FILES],
 [Configuration files: