diff --git a/ChangeLog b/ChangeLog index ad940e1e..4c94ca85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-03-02 Akim Demaille + + The whole family supports -V = --version. + + * acgeneral.m4 (AC_INIT_PARSE_ARGS): Report and support -V. + * autoconf.sh: Likewise. + * autoreconf.sh: Likewise. + * autoupdate.sh: Likewise. + * autoheader.sh: Likewise. + * autoscan.pl: Likewise. + * ifnames.sh: Likewise. + In addition, don't dump --help on invalid options. + * doc/autoconf.texi: Adjusted. + * doc/install.texi: Likewise. + 2000-03-02 Lars J. Aas * libm4.m4 (m4_noquote): New macro. diff --git a/acgeneral.m4 b/acgeneral.m4 index c786574a..479bc040 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -709,7 +709,7 @@ Defaults for the options are specified in brackets. Configuration: -h, --help print this message - --version print the version of autoconf that created configure + -V, --version print the version of autoconf that created configure -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE -n, --no-create do not create output files @@ -914,7 +914,7 @@ Some influent environment variables:$ac_arg_var_help" -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) + -version | --version | --versio | --versi | --vers | -V) echo "configure generated by autoconf version ]AC_ACVERSION[" exit 0 ;; diff --git a/autoconf.in b/autoconf.in index 892569d7..2f1b5362 100644 --- a/autoconf.in +++ b/autoconf.in @@ -33,7 +33,7 @@ TEMPLATE-FILE is given, else into \`configure'. If the option \`--trace' is used, no configuration script is created. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing the \`aclocal.m4' file -t, --trace=MACRO report the list of calls to MACRO @@ -104,7 +104,7 @@ verbose=: # Parse command line while test $# -gt 0 ; do case "$1" in - --version | --vers* ) + --version | --vers* | -V ) echo "$version" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; diff --git a/autoconf.sh b/autoconf.sh index 892569d7..2f1b5362 100644 --- a/autoconf.sh +++ b/autoconf.sh @@ -33,7 +33,7 @@ TEMPLATE-FILE is given, else into \`configure'. If the option \`--trace' is used, no configuration script is created. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing the \`aclocal.m4' file -t, --trace=MACRO report the list of calls to MACRO @@ -104,7 +104,7 @@ verbose=: # Parse command line while test $# -gt 0 ; do case "$1" in - --version | --vers* ) + --version | --vers* | -V ) echo "$version" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; diff --git a/autoheader.in b/autoheader.in index d1c87d64..34db1b91 100644 --- a/autoheader.in +++ b/autoheader.in @@ -33,11 +33,11 @@ use. To this end, scan TEMPLATE-FILE, or \`configure.in' if none given. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -d, --debug don't remove temporary files -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing \`aclocal.m4' and \`acconfig.h' - -v, --verbose verbosely report processing Report bugs to ." diff --git a/autoheader.sh b/autoheader.sh index d1c87d64..34db1b91 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -33,11 +33,11 @@ use. To this end, scan TEMPLATE-FILE, or \`configure.in' if none given. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -d, --debug don't remove temporary files -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing \`aclocal.m4' and \`acconfig.h' - -v, --verbose verbosely report processing Report bugs to ." diff --git a/autoreconf.in b/autoreconf.in index 0543d1b2..ab934f62 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -1,6 +1,6 @@ #! @SHELL@ # autoreconf - remake all Autoconf configure scripts in a directory tree -# Copyright (C) 1994, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,12 +30,12 @@ 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. + -h, --help print this help, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -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 @@ -50,7 +50,7 @@ version="\ autoreconf (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -69,7 +69,7 @@ while test $# -gt 0; do case "$1" in --help | --h* | -h ) echo "$usage"; exit 0 ;; - --version | --vers*) + --version | --vers* | -V ) echo "$version"; exit 0 ;; --localdir=* | --l*=* ) diff --git a/autoreconf.sh b/autoreconf.sh index 0543d1b2..ab934f62 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -1,6 +1,6 @@ #! @SHELL@ # autoreconf - remake all Autoconf configure scripts in a directory tree -# Copyright (C) 1994, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,12 +30,12 @@ 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. + -h, --help print this help, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -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 @@ -50,7 +50,7 @@ version="\ autoreconf (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -69,7 +69,7 @@ while test $# -gt 0; do case "$1" in --help | --h* | -h ) echo "$usage"; exit 0 ;; - --version | --vers*) + --version | --vers* | -V ) echo "$version"; exit 0 ;; --localdir=* | --l*=* ) diff --git a/autoscan.in b/autoscan.in index 2bf4a4dd..d67d25b0 100644 --- a/autoscan.in +++ b/autoscan.in @@ -1,6 +1,6 @@ #! @PERL@ # autoscan - Create configure.scan (a preliminary configure.in) for a package. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,10 +47,10 @@ 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 + -h, --help print this help, then exit + -V, --version print version number, then exit + --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 @@ -59,20 +59,20 @@ EOD autoscan (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { $datadir = $1; - } elsif (/^--h/) { + } elsif (/^--h/ || /^-h$/) { print "$usage"; exit 0; - } elsif (/^--verb/) { + } elsif (/^--verb/ || /^-v$/) { $verbose = 1; - } elsif (/^--vers/) { + } elsif (/^--vers/ || /^-V$/) { print "$version"; exit 0; } elsif (/^[^-]/) { diff --git a/autoscan.pl b/autoscan.pl index 2bf4a4dd..d67d25b0 100644 --- a/autoscan.pl +++ b/autoscan.pl @@ -1,6 +1,6 @@ #! @PERL@ # autoscan - Create configure.scan (a preliminary configure.in) for a package. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,10 +47,10 @@ 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 + -h, --help print this help, then exit + -V, --version print version number, then exit + --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 @@ -59,20 +59,20 @@ EOD autoscan (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { $datadir = $1; - } elsif (/^--h/) { + } elsif (/^--h/ || /^-h$/) { print "$usage"; exit 0; - } elsif (/^--verb/) { + } elsif (/^--verb/ || /^-v$/) { $verbose = 1; - } elsif (/^--vers/) { + } elsif (/^--vers/ || /^-V$/) { print "$version"; exit 0; } elsif (/^[^-]/) { diff --git a/bin/autoconf.in b/bin/autoconf.in index 892569d7..2f1b5362 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -33,7 +33,7 @@ TEMPLATE-FILE is given, else into \`configure'. If the option \`--trace' is used, no configuration script is created. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing the \`aclocal.m4' file -t, --trace=MACRO report the list of calls to MACRO @@ -104,7 +104,7 @@ verbose=: # Parse command line while test $# -gt 0 ; do case "$1" in - --version | --vers* ) + --version | --vers* | -V ) echo "$version" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; diff --git a/bin/autoheader.in b/bin/autoheader.in index d1c87d64..34db1b91 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -33,11 +33,11 @@ use. To this end, scan TEMPLATE-FILE, or \`configure.in' if none given. -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -d, --debug don't remove temporary files -m, --macrodir=DIR directory storing Autoconf's macro files -l, --localdir=DIR directory storing \`aclocal.m4' and \`acconfig.h' - -v, --verbose verbosely report processing Report bugs to ." diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 0543d1b2..ab934f62 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -1,6 +1,6 @@ #! @SHELL@ # autoreconf - remake all Autoconf configure scripts in a directory tree -# Copyright (C) 1994, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,12 +30,12 @@ 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. + -h, --help print this help, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing -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 @@ -50,7 +50,7 @@ version="\ autoreconf (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -69,7 +69,7 @@ while test $# -gt 0; do case "$1" in --help | --h* | -h ) echo "$usage"; exit 0 ;; - --version | --vers*) + --version | --vers* | -V ) echo "$version"; exit 0 ;; --localdir=* | --l*=* ) diff --git a/bin/autoscan.in b/bin/autoscan.in index 2bf4a4dd..d67d25b0 100644 --- a/bin/autoscan.in +++ b/bin/autoscan.in @@ -1,6 +1,6 @@ #! @PERL@ # autoscan - Create configure.scan (a preliminary configure.in) for a package. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,10 +47,10 @@ 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 + -h, --help print this help, then exit + -V, --version print version number, then exit + --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 @@ -59,20 +59,20 @@ EOD autoscan (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie. -Copyright (C) 1994, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. EOD foreach $_ (@ARGV) { if (/^--m[a-z]*=(.*)/) { $datadir = $1; - } elsif (/^--h/) { + } elsif (/^--h/ || /^-h$/) { print "$usage"; exit 0; - } elsif (/^--verb/) { + } elsif (/^--verb/ || /^-v$/) { $verbose = 1; - } elsif (/^--vers/) { + } elsif (/^--vers/ || /^-V$/) { print "$version"; exit 0; } elsif (/^[^-]/) { diff --git a/bin/ifnames.in b/bin/ifnames.in index f1038a7a..dac16875 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -1,6 +1,6 @@ #! @SHELL@ # ifnames - print the identifiers used in C preprocessor conditionals -# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,6 +23,8 @@ # Written by David MacKenzie # and Paul Eggert . +me=`echo "$0" | sed -e 's,.*/,,'` + usage="\ Usage: ifnames [OPTION] ... [FILE] ... @@ -32,9 +34,9 @@ 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. - -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing Report bugs to ." @@ -42,19 +44,26 @@ version="\ ifnames (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie and Paul Eggert. -Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +help="\ +Try \`$me --help' for more information." + while test $# -gt 0; do case "$1" in - -h | --help | --h* ) + --h* | -h ) echo "$usage"; exit 0 ;; - --version | --versio | --versi | --vers) + --v* | -V ) echo "$version"; exit 0 ;; --) # Stop option processing. shift; break ;; - -*) echo "$usage" 1>&2; exit 1 ;; + -*) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; *) break ;; esac done diff --git a/doc/autoconf.texi b/doc/autoconf.texi index c856b4f5..5ca27ddf 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -623,6 +623,7 @@ Print the names of the files it examines and the potentially interesting symbols it finds in them. This output can be voluminous. @item --version +@itemx -V Print the version number of Autoconf and exit. @end table @@ -654,6 +655,7 @@ space-separated list of the files in which that identifier occurs. Print a summary of the command line options and exit. @item --version +@itemx -V Print the version number of Autoconf and exit. @end table @@ -701,6 +703,7 @@ set the @code{AC_MACRODIR} environment variable to a directory; this option overrides the environment variable. @item --version +@itemx -V Print the version number of Autoconf and exit. @item --trace=@var{macro} @@ -796,6 +799,7 @@ Print the name of each directory where @code{autoreconf} runs @code{autoconf} (and @code{autoheader}, if appropriate). @item --version +@itemx -V Print the version number of Autoconf and exit. @end table @@ -1550,6 +1554,7 @@ Look for the installed macro files and @file{acconfig.h} in directory to a directory; this option overrides the environment variable. @item --version +@itemx -V Print the version number of Autoconf and exit. @end table @@ -5747,6 +5752,7 @@ Print a summary of the command line options, a list of the template files and exit. @item --version +@itemx -V Print the version number of Autoconf used to create the @code{configure} script that generated @file{config.status} and exit. @end table @@ -6165,6 +6171,7 @@ environment variable to a directory; this option overrides the environment variable. @item --version +@itemx -V Print the version number of @code{autoupdate} and exit. @end table diff --git a/doc/install.texi b/doc/install.texi index c2764a76..1a3f423b 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -220,6 +220,7 @@ operates. Print a summary of the options to @code{configure}, and exit. @item --version +@itemx -V Print the version of Autoconf used to generate the @code{configure} script, and exit. diff --git a/ifnames.in b/ifnames.in index f1038a7a..dac16875 100644 --- a/ifnames.in +++ b/ifnames.in @@ -1,6 +1,6 @@ #! @SHELL@ # ifnames - print the identifiers used in C preprocessor conditionals -# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,6 +23,8 @@ # Written by David MacKenzie # and Paul Eggert . +me=`echo "$0" | sed -e 's,.*/,,'` + usage="\ Usage: ifnames [OPTION] ... [FILE] ... @@ -32,9 +34,9 @@ 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. - -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing Report bugs to ." @@ -42,19 +44,26 @@ version="\ ifnames (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie and Paul Eggert. -Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +help="\ +Try \`$me --help' for more information." + while test $# -gt 0; do case "$1" in - -h | --help | --h* ) + --h* | -h ) echo "$usage"; exit 0 ;; - --version | --versio | --versi | --vers) + --v* | -V ) echo "$version"; exit 0 ;; --) # Stop option processing. shift; break ;; - -*) echo "$usage" 1>&2; exit 1 ;; + -*) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; *) break ;; esac done diff --git a/ifnames.sh b/ifnames.sh index f1038a7a..dac16875 100644 --- a/ifnames.sh +++ b/ifnames.sh @@ -1,6 +1,6 @@ #! @SHELL@ # ifnames - print the identifiers used in C preprocessor conditionals -# Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,6 +23,8 @@ # Written by David MacKenzie # and Paul Eggert . +me=`echo "$0" | sed -e 's,.*/,,'` + usage="\ Usage: ifnames [OPTION] ... [FILE] ... @@ -32,9 +34,9 @@ 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. - -v, --verbose verbosely report processing -h, --help print this help, then exit - --version print version number, then exit + -V, --version print version number, then exit + -v, --verbose verbosely report processing Report bugs to ." @@ -42,19 +44,26 @@ version="\ ifnames (GNU @PACKAGE@) @VERSION@ Written by David J. MacKenzie and Paul Eggert. -Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc. +Copyright (C) 1994, 95, 99, 2000 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +help="\ +Try \`$me --help' for more information." + while test $# -gt 0; do case "$1" in - -h | --help | --h* ) + --h* | -h ) echo "$usage"; exit 0 ;; - --version | --versio | --versi | --vers) + --v* | -V ) echo "$version"; exit 0 ;; --) # Stop option processing. shift; break ;; - -*) echo "$usage" 1>&2; exit 1 ;; + -*) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; *) break ;; esac done diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index c786574a..479bc040 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -709,7 +709,7 @@ Defaults for the options are specified in brackets. Configuration: -h, --help print this message - --version print the version of autoconf that created configure + -V, --version print the version of autoconf that created configure -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE -n, --no-create do not create output files @@ -914,7 +914,7 @@ Some influent environment variables:$ac_arg_var_help" -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) + -version | --version | --versio | --versi | --vers | -V) echo "configure generated by autoconf version ]AC_ACVERSION[" exit 0 ;; diff --git a/man/autoconf.1 b/man/autoconf.1 index 119f0bca..8825ac8d 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTOCONF "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH AUTOCONF "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME autoconf \- Generate configuration scripts .SH SYNOPSIS @@ -15,7 +15,7 @@ If the option `--trace' is used, no configuration script is created. \fB\-h\fR, \fB\-\-help\fR print this help, then exit .TP -\fB\-\-version\fR +\fB\-V\fR, \fB\-\-version\fR print version number, then exit .TP \fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR diff --git a/man/autoheader.1 b/man/autoheader.1 index 49ab7d96..d745d58c 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTOHEADER "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH AUTOHEADER "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME autoheader \- Create a template header for configure .SH SYNOPSIS @@ -13,9 +13,12 @@ given. \fB\-h\fR, \fB\-\-help\fR print this help, then exit .TP -\fB\-\-version\fR +\fB\-V\fR, \fB\-\-version\fR print version number, then exit .TP +\fB\-v\fR, \fB\-\-verbose\fR +verbosely report processing +.TP \fB\-d\fR, \fB\-\-debug\fR don't remove temporary files .TP @@ -24,9 +27,6 @@ directory storing Autoconf's macro files .TP \fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR directory storing `aclocal.m4' and `acconfig.h' -.TP -\fB\-v\fR, \fB\-\-verbose\fR -verbosely report processing .SH AUTHOR Written by Roland McGrath. .SH "REPORTING BUGS" diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 54348af5..4aff30cb 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTORECONF "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH AUTORECONF "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME autoreconf \- Update generated configuration files .SH SYNOPSIS @@ -14,6 +14,15 @@ 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. .TP +\fB\-h\fR, \fB\-\-help\fR +print this help, then exit +.TP +\fB\-V\fR, \fB\-\-version\fR +print version number, then exit +.TP +\fB\-v\fR, \fB\-\-verbose\fR +verbosely report processing +.TP \fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR directory storing macro files .TP @@ -22,15 +31,6 @@ directory storing `aclocal.m4' and `acconfig.h' .TP \fB\-f\fR, \fB\-\-force\fR consider every files are obsolete -.TP -\fB\-v\fR, \fB\-\-verbose\fR -verbosely report processing -.TP -\fB\-h\fR, \fB\-\-help\fR -print this help, then exit -.TP -\fB\-\-version\fR -print version number, then exit .SS "The following options are passed to `automake':" .TP \fB\-\-cygnus\fR @@ -52,7 +52,7 @@ Written by David J. MacKenzie. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1994, 1999 Free Software Foundation, Inc. +Copyright \(co 1994, 99, 2000 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/man/autoscan.1 b/man/autoscan.1 index b76de8b7..2b4ce029 100644 --- a/man/autoscan.1 +++ b/man/autoscan.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTOSCAN "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH AUTOSCAN "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME autoscan \- Generate a preliminary configure.in .SH SYNOPSIS @@ -11,26 +11,26 @@ 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. .TP -\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR +\fB\-h\fR, \fB\-\-help\fR +print this help, then exit +.TP +\fB\-V\fR, \fB\-\-version\fR +print version number, then exit +.TP +\fB\-\-macrodir\fR=\fIDIR\fR directory storing data files .TP \fB\-v\fR, \fB\-\-verbose\fR verbosely report processing -.TP -\fB\-\-help\fR -print this help, then exit -.TP -\fB\-\-version\fR -print version number, then exit .SH AUTHOR Written by David J. MacKenzie. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1994, 1999 Free Software Foundation, Inc. +Copyright \(co 1994, 99, 2000 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR autoreconf (1), diff --git a/man/autoupdate.1 b/man/autoupdate.1 index 6b7c3634..1e473ceb 100644 --- a/man/autoupdate.1 +++ b/man/autoupdate.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH AUTOUPDATE "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH AUTOUPDATE "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME autoupdate \- Update a configure.in to a newer Autoconf .SH SYNOPSIS @@ -10,20 +10,20 @@ Update the TEMPLATE-FILE... if given, or `configure.in' by default, to the syntax of the current version of `autoconf'. The original files are backed up. .TP -\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR -directory storing Autoconf's files -.TP \fB\-h\fR, \fB\-\-help\fR print this help, then exit .TP -\fB\-\-version\fR +\fB\-V\fR, \fB\-\-version\fR print version number, then exit +.TP +\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR +directory storing Autoconf's files .SH AUTHOR Written by David J. MacKenzie. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1994, 1999 Free Software Foundation, Inc. +Copyright \(co 1994, 99, 2000 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/man/ifnames.1 b/man/ifnames.1 index d6d44f3f..fdfcfb20 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. -.TH IFNAMES "1" "February 2000" "GNU autoconf 2.14a" FSF +.TH IFNAMES "1" "March 2000" "GNU autoconf 2.14a" FSF .SH NAME ifnames \- Extract CPP conditionals from a set of files .SH SYNOPSIS @@ -12,20 +12,20 @@ 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. .TP -\fB\-v\fR, \fB\-\-verbose\fR -verbosely report processing -.TP \fB\-h\fR, \fB\-\-help\fR print this help, then exit .TP -\fB\-\-version\fR +\fB\-V\fR, \fB\-\-version\fR print version number, then exit +.TP +\fB\-v\fR, \fB\-\-verbose\fR +verbosely report processing .SH AUTHOR Written by David J. MacKenzie and Paul Eggert. .SH "REPORTING BUGS" Report bugs to . .SH COPYRIGHT -Copyright \(co 1994, 1995, 1999 Free Software Foundation, Inc. +Copyright \(co 1994, 95, 99, 2000 Free Software Foundation, Inc. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.