From: Ben Elliston Date: Fri, 8 Jan 1999 03:38:59 +0000 (+0000) Subject: 1999-01-08 Ben Elliston X-Git-Tag: experimental-branchpoint~79 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0cf83b8904f2b7da8077d774cad9e5edef20c10;p=thirdparty%2Fautoconf.git 1999-01-08 Ben Elliston * autoconf.sh: More useful and up-to-date help from the --help option. Contributed by Akim Demaille . * autoheader.sh: Likewise. * autoreconf.sh: Likewise. * autoscan.pl: Likewise. * autoupdate.sh: Likewise. * ifnames.sh: Likewise. --- diff --git a/ChangeLog b/ChangeLog index b86d854e..319c0d4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 1999-01-08 Ben Elliston + * autoconf.sh: More useful and up-to-date help from the --help + option. Contributed by Akim Demaille . + + * 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 . diff --git a/autoconf.in b/autoconf.in index e6b0819f..f2185cb8 100644 --- 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 ." # 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 e6b0819f..f2185cb8 100644 --- 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 ." # 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 196c16df..ef4233a3 100644 --- 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 ." # 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 196c16df..ef4233a3 100644 --- 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 ." # 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 99770bbf..eeea03da 100644 --- 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 ." localdir= verbose=no diff --git a/autoreconf.sh b/autoreconf.sh index 99770bbf..eeea03da 100644 --- 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 ." localdir= verbose=no diff --git a/autoscan.in b/autoscan.in index 32852360..0e29a790 100644 --- 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 . +EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { diff --git a/autoscan.pl b/autoscan.pl index 32852360..0e29a790 100644 --- 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 . +EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { diff --git a/bin/autoconf.in b/bin/autoconf.in index e6b0819f..f2185cb8 100644 --- 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 ." # 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 196c16df..ef4233a3 100644 --- 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 ." # 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 99770bbf..eeea03da 100644 --- 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 ." localdir= verbose=no diff --git a/bin/autoscan.in b/bin/autoscan.in index 32852360..0e29a790 100644 --- 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 . +EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { diff --git a/bin/ifnames.in b/bin/ifnames.in index cb0158ba..7709d283 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -24,7 +24,21 @@ # and Paul Eggert . 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 ." + show_version=no : ${AC_MACRODIR=@datadir@} diff --git a/ifnames.in b/ifnames.in index cb0158ba..7709d283 100644 --- a/ifnames.in +++ b/ifnames.in @@ -24,7 +24,21 @@ # and Paul Eggert . 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 ." + show_version=no : ${AC_MACRODIR=@datadir@} diff --git a/ifnames.sh b/ifnames.sh index cb0158ba..7709d283 100644 --- a/ifnames.sh +++ b/ifnames.sh @@ -24,7 +24,21 @@ # and Paul Eggert . 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 ." + show_version=no : ${AC_MACRODIR=@datadir@}