From: Lars J. Aas <larsa@sim.no>
Date: Tue, 17 Apr 2001 13:15:54 +0000 (+0000)
Subject: Reversal of
X-Git-Tag: autoconf-2.50~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bc8358b7787f95a7ab4680145c3d5e976f67367;p=thirdparty%2Fautoconf.git

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 bb9899afe..35afc9630 100644
--- 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 46af809e9..f46d036e1 100644
--- 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 46af809e9..f46d036e1 100644
--- 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: