Avoid outputting `config_files' code in `config.status' if there

are none.

* acgeneral.m4 (AC_OUTPUT): Don't register $1 to `AC_CONFIG_FILES'
if $1 is empty.
Normalize the names of the sections in `config.status --help'.

diff --git a/ChangeLog b/ChangeLog
index 6986d931809cf59d8ccfb63e1e39d2f31d56a91d..6bfe4775d490621a26bdc5650796c90ce3e948bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-09  Akim Demaille  <akim@epita.fr>
+
+       Avoid outputting `config_files' code in `config.status' if there
+       are none.
+
+       * acgeneral.m4 (AC_OUTPUT): Don't register $1 to `AC_CONFIG_FILES'
+       if $1 is empty.
+       Normalize the names of the sections in `config.status --help'.
+
 2000-02-09  Akim Demaille  <akim@epita.fr>
 
        * README-alpha: New file, based on Automake's.

diff --git a/acgeneral.m4 b/acgeneral.m4
index ed73c6d7df86cc7482aefacbd1c52e9314de1c07..e3c3fd1a5205495cdf7bd775403b9ca3234926aa 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3228,7 +3228,8 @@ define([AC_LIST_SUBDIRS])
 # shells die.  Unfortunately the limit is not known precisely...
 define(AC_OUTPUT,
 [dnl Dispatch the extra arguments to their native macros.
-AC_CONFIG_FILES([$1])dnl
+ifval([$1],
+      [AC_CONFIG_FILES([$1])])dnl
 AC_OUTPUT_COMMANDS([$2], [$3])dnl
 trap '' 1 2 15
 AC_CACHE_SAVE
@@ -3331,12 +3332,12 @@ ifset([AC_LIST_HEADERS],
 
 ])dnl
 ifset([AC_LIST_LINKS],
-[Links to install:
+[Configuration links:
 \$config_links
 
 ])dnl
 ifset([AC_LIST_COMMANDS],
-[Individual commands to run:
+[Configuration commands:
 \$config_commands
 
 ])dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index ed73c6d7df86cc7482aefacbd1c52e9314de1c07..e3c3fd1a5205495cdf7bd775403b9ca3234926aa 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3228,7 +3228,8 @@ define([AC_LIST_SUBDIRS])
 # shells die.  Unfortunately the limit is not known precisely...
 define(AC_OUTPUT,
 [dnl Dispatch the extra arguments to their native macros.
-AC_CONFIG_FILES([$1])dnl
+ifval([$1],
+      [AC_CONFIG_FILES([$1])])dnl
 AC_OUTPUT_COMMANDS([$2], [$3])dnl
 trap '' 1 2 15
 AC_CACHE_SAVE
@@ -3331,12 +3332,12 @@ ifset([AC_LIST_HEADERS],
 
 ])dnl
 ifset([AC_LIST_LINKS],
-[Links to install:
+[Configuration links:
 \$config_links
 
 ])dnl
 ifset([AC_LIST_COMMANDS],
-[Individual commands to run:
+[Configuration commands:
 \$config_commands
 
 ])dnl