Show config.status options `--file' and `--header' unconditionally.

diff --git a/ChangeLog b/ChangeLog
index e72b0efaf8f9086d6cec3c0ea6b046a8a355bd33..c5c3d442e11e8028eaf8d2afc1ba3c8706aefdef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-13  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 c4a8f955bf3da08dedd32a201055a8df46f9d6b7..e25983db9d7a2d9a165598a9cb2005fdbb4098a9 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3651,14 +3651,10 @@ 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
-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
+  --file=FILE[[:TEMPLATE]]
+                   instantiate a configuration file FILE
+  --header=FILE[[:TEMPLATE]]
+                   instantiate a configuration header FILE
 
 m4_ifset([AC_LIST_FILES],
 [Configuration files:

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c4a8f955bf3da08dedd32a201055a8df46f9d6b7..e25983db9d7a2d9a165598a9cb2005fdbb4098a9 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3651,14 +3651,10 @@ 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
-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
+  --file=FILE[[:TEMPLATE]]
+                   instantiate a configuration file FILE
+  --header=FILE[[:TEMPLATE]]
+                   instantiate a configuration header FILE
 
 m4_ifset([AC_LIST_FILES],
 [Configuration files: