1999-01-08 Ben Elliston <bje@cygnus.com>

	* autoconf.sh: More useful and up-to-date help from the --help
	option. Contributed by Akim Demaille <demaille@inf.enst.fr>.
	* autoheader.sh: Likewise.
	* autoreconf.sh: Likewise.
	* autoscan.pl: Likewise.
	* autoupdate.sh: Likewise.
	* ifnames.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b86d854e0f5aeb2e0f21db87385e56d6cab1659c..319c0d4e38b733f5b19e4acc19cb3c1c90dae5fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 1999-01-08  Ben Elliston  <bje@cygnus.com>
 
+       * autoconf.sh: More useful and up-to-date help from the --help
+       option. Contributed by Akim Demaille <demaille@inf.enst.fr>.
+
+       * autoheader.sh: Likewise.
+
+       * autoreconf.sh: Likewise.
+
+       * autoscan.pl: Likewise.
+
+       * autoupdate.sh: Likewise.
+
+       * ifnames.sh: Likewise.
+
        * config.guess: Detect Cray T3E and NEC SX-4, SX-5 machines.
        Contributed by Andreas Schott <schott@rzg.mpg.de>.
 

diff --git a/autoconf.in b/autoconf.in
index e6b0819fab30b18f8c3084c76097da301445fb0d..f2185cb879b53c761cf2c725c39969b5a066c8a0 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -22,8 +22,19 @@
 # the given template file.
 
 usage="\
-Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoconf [OPTION] ... [TEMPLATE-FILE]
+
+Generate a configuration script from a TEMPLATE-FILE if given, or
+\`configure.in' by default.  Output is sent to the standard output if
+TEMPLATE-FILE is given, else into \`configure'.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing the \`aclocal.m4' file
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/autoconf.sh b/autoconf.sh
index e6b0819fab30b18f8c3084c76097da301445fb0d..f2185cb879b53c761cf2c725c39969b5a066c8a0 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -22,8 +22,19 @@
 # the given template file.
 
 usage="\
-Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoconf [OPTION] ... [TEMPLATE-FILE]
+
+Generate a configuration script from a TEMPLATE-FILE if given, or
+\`configure.in' by default.  Output is sent to the standard output if
+TEMPLATE-FILE is given, else into \`configure'.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing the \`aclocal.m4' file
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/autoheader.in b/autoheader.in
index 196c16df6930790a7f53c698061534aa13aae188..ef4233a3784141b0f5cabf61025fba82680bd781 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -24,8 +24,19 @@
 # the given template file.
 
 usage="\
-Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+
+Create a template file of C \`#define' statements for \`configure' to
+use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
+given.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/autoheader.sh b/autoheader.sh
index 196c16df6930790a7f53c698061534aa13aae188..ef4233a3784141b0f5cabf61025fba82680bd781 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -24,8 +24,19 @@
 # the given template file.
 
 usage="\
-Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+
+Create a template file of C \`#define' statements for \`configure' to
+use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
+given.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/autoreconf.in b/autoreconf.in
index 99770bbf2f26522638d8498d46896974ad99adfb..eeea03da2c18669057e87b8c02faa390f5161b79 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -18,9 +18,31 @@
 # 02111-1307, USA.
 
 usage="\
-Usage: autoreconf [-f] [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--force] [--verbose] [--version]
-       [--cygnus] [--foreign] [--gnits] [--gnu] [-i] [--include-deps]"
+Usage: autoreconf [OPTION] ... [TEMPLATE-FILE]
+
+Run \`autoconf' (and \`autoheader' and \`automake', where appropriate)
+repeatedly to remake the Autoconf \`configure' scripts and
+configuration header templates in the directory tree rooted at the
+current directory.  By default, it only remakes those files that are
+older than their predecessors.  If you install a new version of
+Autoconf, running \`autoreconf' remakes all of the files by giving it
+the \`--force' option.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -f, --force           consider every files are obsolete
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+The following options are passed to \`automake':
+  --cygnus              assume program is part of Cygnus-style tree
+  --foreign             set strictness to foreign
+  --gnits               set strictness to gnits
+  --gnu                 set strictness to gnu
+  -i, --include-deps    include generated dependencies in Makefile.in
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 localdir=
 verbose=no

diff --git a/autoreconf.sh b/autoreconf.sh
index 99770bbf2f26522638d8498d46896974ad99adfb..eeea03da2c18669057e87b8c02faa390f5161b79 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -18,9 +18,31 @@
 # 02111-1307, USA.
 
 usage="\
-Usage: autoreconf [-f] [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--force] [--verbose] [--version]
-       [--cygnus] [--foreign] [--gnits] [--gnu] [-i] [--include-deps]"
+Usage: autoreconf [OPTION] ... [TEMPLATE-FILE]
+
+Run \`autoconf' (and \`autoheader' and \`automake', where appropriate)
+repeatedly to remake the Autoconf \`configure' scripts and
+configuration header templates in the directory tree rooted at the
+current directory.  By default, it only remakes those files that are
+older than their predecessors.  If you install a new version of
+Autoconf, running \`autoreconf' remakes all of the files by giving it
+the \`--force' option.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -f, --force           consider every files are obsolete
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+The following options are passed to \`automake':
+  --cygnus              assume program is part of Cygnus-style tree
+  --foreign             set strictness to foreign
+  --gnits               set strictness to gnits
+  --gnu                 set strictness to gnu
+  -i, --include-deps    include generated dependencies in Makefile.in
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 localdir=
 verbose=no

diff --git a/autoscan.in b/autoscan.in
index 32852360f5179ffe4be64c7f191c29ca2c415b1a..0e29a790353bc74c37c0d4e5a22c3b918505a8c4 100644 (file)
--- a/autoscan.in
+++ b/autoscan.in
@@ -39,8 +39,21 @@ exit 0;
 # Process any command line arguments.
 sub parse_args
 {
-    local ($usage) =
-       "Usage: autoscan [--macrodir=dir] [--help] [--verbose] [--version] [srcdir]\n"; 
+    local ($usage) = << 'EOD';
+Usage: autoscan [OPTION] ... [SRCDIR]
+
+Examine source files in the directory tree rooted at SRCDIR, or the
+current directory if none is given.  Search the source files for
+common portability problems and create a file `configure.scan' which
+is a preliminary `configure.in' for that package.
+
+  -m, --macrodir=DIR    directory storing data files
+  -v, --verbose         verbosely report processing
+  --help                print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>.
+EOD
 
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {

diff --git a/autoscan.pl b/autoscan.pl
index 32852360f5179ffe4be64c7f191c29ca2c415b1a..0e29a790353bc74c37c0d4e5a22c3b918505a8c4 100644 (file)
--- a/autoscan.pl
+++ b/autoscan.pl
@@ -39,8 +39,21 @@ exit 0;
 # Process any command line arguments.
 sub parse_args
 {
-    local ($usage) =
-       "Usage: autoscan [--macrodir=dir] [--help] [--verbose] [--version] [srcdir]\n"; 
+    local ($usage) = << 'EOD';
+Usage: autoscan [OPTION] ... [SRCDIR]
+
+Examine source files in the directory tree rooted at SRCDIR, or the
+current directory if none is given.  Search the source files for
+common portability problems and create a file `configure.scan' which
+is a preliminary `configure.in' for that package.
+
+  -m, --macrodir=DIR    directory storing data files
+  -v, --verbose         verbosely report processing
+  --help                print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>.
+EOD
 
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {

diff --git a/bin/autoconf.in b/bin/autoconf.in
index e6b0819fab30b18f8c3084c76097da301445fb0d..f2185cb879b53c761cf2c725c39969b5a066c8a0 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -22,8 +22,19 @@
 # the given template file.
 
 usage="\
-Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoconf [OPTION] ... [TEMPLATE-FILE]
+
+Generate a configuration script from a TEMPLATE-FILE if given, or
+\`configure.in' by default.  Output is sent to the standard output if
+TEMPLATE-FILE is given, else into \`configure'.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing the \`aclocal.m4' file
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 196c16df6930790a7f53c698061534aa13aae188..ef4233a3784141b0f5cabf61025fba82680bd781 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -24,8 +24,19 @@
 # the given template file.
 
 usage="\
-Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
+Usage: autoheader [OPTION] ... [TEMPLATE-FILE]
+
+Create a template file of C \`#define' statements for \`configure' to
+use.  To this end, scan TEMPLATE-FILE, or \`configure.in' if none
+given.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 # NLS nuisances.
 # Only set these to C if already set.  These must not be set unconditionally

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 99770bbf2f26522638d8498d46896974ad99adfb..eeea03da2c18669057e87b8c02faa390f5161b79 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -18,9 +18,31 @@
 # 02111-1307, USA.
 
 usage="\
-Usage: autoreconf [-f] [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--force] [--verbose] [--version]
-       [--cygnus] [--foreign] [--gnits] [--gnu] [-i] [--include-deps]"
+Usage: autoreconf [OPTION] ... [TEMPLATE-FILE]
+
+Run \`autoconf' (and \`autoheader' and \`automake', where appropriate)
+repeatedly to remake the Autoconf \`configure' scripts and
+configuration header templates in the directory tree rooted at the
+current directory.  By default, it only remakes those files that are
+older than their predecessors.  If you install a new version of
+Autoconf, running \`autoreconf' remakes all of the files by giving it
+the \`--force' option.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -l, --localdir=DIR    directory storing \`aclocal.m4' and \`acconfig.h'
+  -f, --force           consider every files are obsolete
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+The following options are passed to \`automake':
+  --cygnus              assume program is part of Cygnus-style tree
+  --foreign             set strictness to foreign
+  --gnits               set strictness to gnits
+  --gnu                 set strictness to gnu
+  -i, --include-deps    include generated dependencies in Makefile.in
+
+Report bugs to <bug-autoconf@gnu.org>."
 
 localdir=
 verbose=no

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 32852360f5179ffe4be64c7f191c29ca2c415b1a..0e29a790353bc74c37c0d4e5a22c3b918505a8c4 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -39,8 +39,21 @@ exit 0;
 # Process any command line arguments.
 sub parse_args
 {
-    local ($usage) =
-       "Usage: autoscan [--macrodir=dir] [--help] [--verbose] [--version] [srcdir]\n"; 
+    local ($usage) = << 'EOD';
+Usage: autoscan [OPTION] ... [SRCDIR]
+
+Examine source files in the directory tree rooted at SRCDIR, or the
+current directory if none is given.  Search the source files for
+common portability problems and create a file `configure.scan' which
+is a preliminary `configure.in' for that package.
+
+  -m, --macrodir=DIR    directory storing data files
+  -v, --verbose         verbosely report processing
+  --help                print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>.
+EOD
 
     foreach $_ (@ARGV) {
        if (/^--m[a-z]*=(.*)/) {

diff --git a/bin/ifnames.in b/bin/ifnames.in
index cb0158bac2465bb41006985a78c087b362d24f4d..7709d2838f6a20cacb1d53b612a4bce19027d9ba 100644 (file)
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -24,7 +24,21 @@
 # and Paul Eggert <eggert@twinsun.com>.
 
 usage="\
-Usage: ifnames [-h] [--help] [-m dir] [--macrodir=dir] [--version] [file...]"
+Usage: ifnames [OPTION] ...  [FILE] ...
+
+Scan all of the C source FILES (or the standard input, if none are
+given) and write to the standard output a sorted list of all the
+identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or
+\`#ifndef' directives.  Print each identifier on a line, followed by a
+space-separated list of the files in which that identifier occurs.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
+
 show_version=no
 
 : ${AC_MACRODIR=@datadir@}

diff --git a/ifnames.in b/ifnames.in
index cb0158bac2465bb41006985a78c087b362d24f4d..7709d2838f6a20cacb1d53b612a4bce19027d9ba 100644 (file)
--- a/ifnames.in
+++ b/ifnames.in
@@ -24,7 +24,21 @@
 # and Paul Eggert <eggert@twinsun.com>.
 
 usage="\
-Usage: ifnames [-h] [--help] [-m dir] [--macrodir=dir] [--version] [file...]"
+Usage: ifnames [OPTION] ...  [FILE] ...
+
+Scan all of the C source FILES (or the standard input, if none are
+given) and write to the standard output a sorted list of all the
+identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or
+\`#ifndef' directives.  Print each identifier on a line, followed by a
+space-separated list of the files in which that identifier occurs.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
+
 show_version=no
 
 : ${AC_MACRODIR=@datadir@}

diff --git a/ifnames.sh b/ifnames.sh
index cb0158bac2465bb41006985a78c087b362d24f4d..7709d2838f6a20cacb1d53b612a4bce19027d9ba 100644 (file)
--- a/ifnames.sh
+++ b/ifnames.sh
@@ -24,7 +24,21 @@
 # and Paul Eggert <eggert@twinsun.com>.
 
 usage="\
-Usage: ifnames [-h] [--help] [-m dir] [--macrodir=dir] [--version] [file...]"
+Usage: ifnames [OPTION] ...  [FILE] ...
+
+Scan all of the C source FILES (or the standard input, if none are
+given) and write to the standard output a sorted list of all the
+identifiers that appear in those files in \`#if', \`#elif', \`#ifdef', or
+\`#ifndef' directives.  Print each identifier on a line, followed by a
+space-separated list of the files in which that identifier occurs.
+
+  -m, --macrodir=DIR    directory storing macro files
+  -v, --verbose         verbosely report processing
+  -h, --help            print this help, then exit
+  --version             print version number, then exit
+
+Report bugs to <bug-autoconf@gnu.org>."
+
 show_version=no
 
 : ${AC_MACRODIR=@datadir@}