From 0dd3144b2ebabfef824e71a262a2fad0674364f1 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 26 Oct 2000 22:27:48 +0000 Subject: [PATCH] * autoconf.sh: Don't show obsolete options on "--help". Report obsolete options to stderr. Adjust list of options. Correct processing of options. Process options with values separated by "=" first, so that abbreviations work. Don't accept "=" with short options. * autoheader.sh: Likewise. * autoreconf.sh: Likewise. * autoupdate.sh: Likewise. * ifnames.sh: There is no "--verbose" option. * doc/autoconf.texi: Option "-A" requires an argument. (autoreconf Invocation): Document "--install", "--symlink", "--m4dir" and the options passed to Automake. --- ChangeLog | 15 +++++++++++++++ autoconf.in | 45 ++++++++++++++++++++++----------------------- autoconf.sh | 45 ++++++++++++++++++++++----------------------- autoheader.in | 24 +++++++++++++----------- autoheader.sh | 24 +++++++++++++----------- autoreconf.in | 22 +++++++++++++++------- autoreconf.sh | 22 +++++++++++++++------- bin/autoconf.in | 45 ++++++++++++++++++++++----------------------- bin/autoheader.in | 24 +++++++++++++----------- bin/autoreconf.in | 22 +++++++++++++++------- bin/ifnames.in | 1 - doc/autoconf.texi | 47 ++++++++++++++++++++++++++++++++++++++++++----- ifnames.in | 1 - ifnames.sh | 1 - man/autoconf.1 | 13 +++++++------ man/autoheader.1 | 6 ++++++ man/autoreconf.1 | 6 ------ man/ifnames.1 | 3 --- 18 files changed, 220 insertions(+), 146 deletions(-) diff --git a/ChangeLog b/ChangeLog index a39cec0f..18877461 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-10-26 Pavel Roskin + + * autoconf.sh: Don't show obsolete options on "--help". Report + obsolete options to stderr. Adjust list of options. Correct + processing of options. Process options with values separated by + "=" first, so that abbreviations work. Don't accept "=" with + short options. + * autoheader.sh: Likewise. + * autoreconf.sh: Likewise. + * autoupdate.sh: Likewise. + * ifnames.sh: There is no "--verbose" option. + * doc/autoconf.texi: Option "-A" requires an argument. + (autoreconf Invocation): Document "--install", "--symlink", + "--m4dir" and the options passed to Automake. + 2000-10-26 Akim Demaille * shell.m4: Rename as... diff --git a/autoconf.in b/autoconf.in index c9b4856d..c1e20227 100644 --- a/autoconf.in +++ b/autoconf.in @@ -36,8 +36,6 @@ Operation modes: -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 the \`aclocal.m4' file -o, --output=FILE save output in FILE (stdout is the default) -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] @@ -52,6 +50,10 @@ Warning categories include: The environment variable \`WARNINGS' is honored. +Library directories: + -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) + -l, --localdir=DIR location of the \`aclocal.m4' file + Tracing: -t, --trace=MACRO report the list of calls to MACRO -i, --initialization also trace Autoconf's initialization process @@ -151,59 +153,56 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --trace | -t ) + --trace=* | --t*=* ) + task=trace + traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" + shift ;; + --trace | --t* | -t ) test $# = 1 && eval "$exit_missing_arg" task=trace shift traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'" shift ;; - --trace=* ) - task=trace - traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" - shift ;; - --initialization | -i ) + --initialization | --i* | -i ) initialization=: shift;; - --output | -o ) + --output=* | --o*=* ) + outfile=$optarg + shift ;; + --output | --o* | -o ) test $# = 1 && eval "$exit_missing_arg" shift outfile=$1 shift ;; - --output=* ) - outfile=$optarg - shift ;; - -o* ) - outfile=$optarg - shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W* ) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/autoconf.sh b/autoconf.sh index c9b4856d..c1e20227 100644 --- a/autoconf.sh +++ b/autoconf.sh @@ -36,8 +36,6 @@ Operation modes: -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 the \`aclocal.m4' file -o, --output=FILE save output in FILE (stdout is the default) -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] @@ -52,6 +50,10 @@ Warning categories include: The environment variable \`WARNINGS' is honored. +Library directories: + -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) + -l, --localdir=DIR location of the \`aclocal.m4' file + Tracing: -t, --trace=MACRO report the list of calls to MACRO -i, --initialization also trace Autoconf's initialization process @@ -151,59 +153,56 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --trace | -t ) + --trace=* | --t*=* ) + task=trace + traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" + shift ;; + --trace | --t* | -t ) test $# = 1 && eval "$exit_missing_arg" task=trace shift traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'" shift ;; - --trace=* ) - task=trace - traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" - shift ;; - --initialization | -i ) + --initialization | --i* | -i ) initialization=: shift;; - --output | -o ) + --output=* | --o*=* ) + outfile=$optarg + shift ;; + --output | --o* | -o ) test $# = 1 && eval "$exit_missing_arg" shift outfile=$1 shift ;; - --output=* ) - outfile=$optarg - shift ;; - -o* ) - outfile=$optarg - shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W* ) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/autoheader.in b/autoheader.in index 1f83ec0e..15efe2f2 100644 --- a/autoheader.in +++ b/autoheader.in @@ -40,9 +40,11 @@ given. -W, --warnings=CATEGORY report the warnings falling in CATEGORY Warning categories include: - \`obsolete' obsolete constructs - \`all' all the warnings - \`error' warnings are error + \`obsolete' obsolete constructs + \`all' all the warnings + \`no-CATEGORY' turn off the warnings on CATEGORY + \`none' turn off all the warnings + \`error' warnings are error Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) @@ -122,33 +124,33 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W*) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/autoheader.sh b/autoheader.sh index 1f83ec0e..15efe2f2 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -40,9 +40,11 @@ given. -W, --warnings=CATEGORY report the warnings falling in CATEGORY Warning categories include: - \`obsolete' obsolete constructs - \`all' all the warnings - \`error' warnings are error + \`obsolete' obsolete constructs + \`all' all the warnings + \`no-CATEGORY' turn off the warnings on CATEGORY + \`none' turn off all the warnings + \`error' warnings are error Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) @@ -122,33 +124,33 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W*) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/autoreconf.in b/autoreconf.in index 7672d04e..9d62774c 100644 --- a/autoreconf.in +++ b/autoreconf.in @@ -44,7 +44,6 @@ other tools. Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) - -m, --macro-path=PATH library extensions files -l, --localdir=DIR location of \`aclocal.m4' and \`acconfig.h' -M, --m4dir=M4DIR this package's Autoconf extensions @@ -57,7 +56,6 @@ The following options are passed to \`automake': --gnits set strictness to gnits --gnu set strictness to gnu --include-deps include generated dependencies in Makefile.in - -i deprecated alias for --include-deps The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL are honored. @@ -152,14 +150,24 @@ while test $# -gt 0; do localdir=$1 shift ;; - --macrodir | -m ) + --autoconf-dir=*) + autoconf_dir=$optarg + shift ;; + --autoconf-dir | -A* ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --macrodir=* | -m* ) + --macrodir=* | --m*=* ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; + --macrodir | --m* | -m ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 + test $# = 1 && eval "$exit_missing_arg" + shift + autoconf_dir=$1 + shift ;; --m4dir | -M ) test $# = 1 && eval "$exit_missing_arg" @@ -170,12 +178,12 @@ while test $# -gt 0; do m4dir=$optarg shift ;; - --force | -f ) + --force | --forc* | -f ) force=:; shift ;; - --install | -i ) + --install | --ins* | -i ) install=:; shift ;; - --symlink | --symbolic | -s ) + --symlink | --s* | -s ) symlink=:; shift ;; # Options of Automake. diff --git a/autoreconf.sh b/autoreconf.sh index 7672d04e..9d62774c 100644 --- a/autoreconf.sh +++ b/autoreconf.sh @@ -44,7 +44,6 @@ other tools. Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) - -m, --macro-path=PATH library extensions files -l, --localdir=DIR location of \`aclocal.m4' and \`acconfig.h' -M, --m4dir=M4DIR this package's Autoconf extensions @@ -57,7 +56,6 @@ The following options are passed to \`automake': --gnits set strictness to gnits --gnu set strictness to gnu --include-deps include generated dependencies in Makefile.in - -i deprecated alias for --include-deps The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL are honored. @@ -152,14 +150,24 @@ while test $# -gt 0; do localdir=$1 shift ;; - --macrodir | -m ) + --autoconf-dir=*) + autoconf_dir=$optarg + shift ;; + --autoconf-dir | -A* ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --macrodir=* | -m* ) + --macrodir=* | --m*=* ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; + --macrodir | --m* | -m ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 + test $# = 1 && eval "$exit_missing_arg" + shift + autoconf_dir=$1 + shift ;; --m4dir | -M ) test $# = 1 && eval "$exit_missing_arg" @@ -170,12 +178,12 @@ while test $# -gt 0; do m4dir=$optarg shift ;; - --force | -f ) + --force | --forc* | -f ) force=:; shift ;; - --install | -i ) + --install | --ins* | -i ) install=:; shift ;; - --symlink | --symbolic | -s ) + --symlink | --s* | -s ) symlink=:; shift ;; # Options of Automake. diff --git a/bin/autoconf.in b/bin/autoconf.in index c9b4856d..c1e20227 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -36,8 +36,6 @@ Operation modes: -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 the \`aclocal.m4' file -o, --output=FILE save output in FILE (stdout is the default) -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] @@ -52,6 +50,10 @@ Warning categories include: The environment variable \`WARNINGS' is honored. +Library directories: + -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) + -l, --localdir=DIR location of the \`aclocal.m4' file + Tracing: -t, --trace=MACRO report the list of calls to MACRO -i, --initialization also trace Autoconf's initialization process @@ -151,59 +153,56 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --trace | -t ) + --trace=* | --t*=* ) + task=trace + traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" + shift ;; + --trace | --t* | -t ) test $# = 1 && eval "$exit_missing_arg" task=trace shift traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'" shift ;; - --trace=* ) - task=trace - traces="$traces '"`echo "$optarg" | sed "s/'/'\\\\\\\\''/g"`"'" - shift ;; - --initialization | -i ) + --initialization | --i* | -i ) initialization=: shift;; - --output | -o ) + --output=* | --o*=* ) + outfile=$optarg + shift ;; + --output | --o* | -o ) test $# = 1 && eval "$exit_missing_arg" shift outfile=$1 shift ;; - --output=* ) - outfile=$optarg - shift ;; - -o* ) - outfile=$optarg - shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W* ) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/bin/autoheader.in b/bin/autoheader.in index 1f83ec0e..15efe2f2 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -40,9 +40,11 @@ given. -W, --warnings=CATEGORY report the warnings falling in CATEGORY Warning categories include: - \`obsolete' obsolete constructs - \`all' all the warnings - \`error' warnings are error + \`obsolete' obsolete constructs + \`all' all the warnings + \`no-CATEGORY' turn off the warnings on CATEGORY + \`none' turn off all the warnings + \`error' warnings are error Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) @@ -122,33 +124,33 @@ while test $# -gt 0 ; do localdir=$1 shift ;; - --autoconf-dir=*) + --autoconf-dir=* | --a*=* ) autoconf_dir=$optarg shift ;; - --autoconf-dir | -A* ) + --autoconf-dir | --a* | -A ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; --macrodir=* | --m*=* ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; --macrodir | --m* | -m ) - echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1 + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --warnings | -W ) + --warnings=* | --w*=* ) + warnings=$warnings,$optarg + shift ;; + --warnings | --w* | -W ) test $# = 1 && eval "$exit_missing_arg" shift warnings=$warnings,$1 shift ;; - --warnings=* | -W*) - warnings=$warnings,$optarg - shift ;; -- ) # Stop option processing shift; break ;; diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 7672d04e..9d62774c 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -44,7 +44,6 @@ other tools. Library directories: -A, --autoconf-dir=ACDIR Autoconf's macro files location (rarely needed) - -m, --macro-path=PATH library extensions files -l, --localdir=DIR location of \`aclocal.m4' and \`acconfig.h' -M, --m4dir=M4DIR this package's Autoconf extensions @@ -57,7 +56,6 @@ The following options are passed to \`automake': --gnits set strictness to gnits --gnu set strictness to gnu --include-deps include generated dependencies in Makefile.in - -i deprecated alias for --include-deps The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL are honored. @@ -152,14 +150,24 @@ while test $# -gt 0; do localdir=$1 shift ;; - --macrodir | -m ) + --autoconf-dir=*) + autoconf_dir=$optarg + shift ;; + --autoconf-dir | -A* ) test $# = 1 && eval "$exit_missing_arg" shift autoconf_dir=$1 shift ;; - --macrodir=* | -m* ) + --macrodir=* | --m*=* ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 autoconf_dir=$optarg shift ;; + --macrodir | --m* | -m ) + echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2 + test $# = 1 && eval "$exit_missing_arg" + shift + autoconf_dir=$1 + shift ;; --m4dir | -M ) test $# = 1 && eval "$exit_missing_arg" @@ -170,12 +178,12 @@ while test $# -gt 0; do m4dir=$optarg shift ;; - --force | -f ) + --force | --forc* | -f ) force=:; shift ;; - --install | -i ) + --install | --ins* | -i ) install=:; shift ;; - --symlink | --symbolic | -s ) + --symlink | --s* | -s ) symlink=:; shift ;; # Options of Automake. diff --git a/bin/ifnames.in b/bin/ifnames.in index 208b7855..912cbfcc 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -36,7 +36,6 @@ space-separated list of the files in which that identifier occurs. -h, --help print this help, then exit -V, --version print version number, then exit - -v, --verbose verbosely report processing Report bugs to ." diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 92cd4884..59e7a4bc 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -877,7 +877,7 @@ Print the names of the files it examines and the potentially interesting symbols it finds in them. This output can be voluminous. @item --autoconf-dir=@var{dir} -@itemx -A +@itemx -A @var{dir} @evindex AC_MACRODIR Overwrite the location where Autoconf files were installed. You can also set the @code{AC_MACRODIR} environment variable to a directory; @@ -963,7 +963,7 @@ Report processing steps. Don't remove the temporary files. @item --autoconf-dir=@var{dir} -@itemx -A +@itemx -A @var{dir} @evindex AC_MACRODIR Overwrite the location where Autoconf files were installed. You can also set the @code{AC_MACRODIR} environment variable to a directory; @@ -1208,6 +1208,15 @@ Remake even @file{configure} scripts and configuration headers that are newer than their input files (@file{configure.in} and, if present, @file{aclocal.m4}). +@item --install +@itemx -i +Copy missing auxiliary files. This option is similar to the option +@code{--add-missing} in @code{automake}. + +@item --symlink +@itemx -s +Instead of copying missing auxiliary files, install symbolic links. + @item --localdir=@var{dir} @itemx -l @var{dir} Have @code{autoconf} and @code{autoheader} look for the package files @@ -1216,7 +1225,7 @@ not @file{@var{file}.top} and @file{@var{file}.bot}) in directory @var{dir} instead of in the directory containing each @file{configure.in}. @item --autoconf-dir=@var{dir} -@itemx -A +@itemx -A @var{dir} @evindex AC_MACRODIR Overwrite the location where Autoconf files were installed. You can also set the @code{AC_MACRODIR} environment variable to a directory; @@ -1224,6 +1233,30 @@ this option overrides the environment variable. This option is rarely needed and dangerous: only when you play with different versions of Autoconf. + +@item --m4dir=@var{dir} +@itemx -M @var{dir} +Specify location of additional macro files (@file{m4} by default). +@end table + +Additionally, the following options are recognized and passed to +@code{automake}: + +@table @option +@item --cygnus +Assume program is part of Cygnus-style tree. + +@item --foreign +Set strictness to foreign. + +@item --gnits +Set strictness to gnits. + +@item --gnu +Set strictness to gnu. + +@item --include-deps +Include generated dependencies in @file{Makefile.in}. @end table @@ -2153,8 +2186,12 @@ Print the version number of Autoconf and exit. @itemx -d Don't remove the temporary files. +@item --verbose +@itemx -v +Report processing steps. + @item --autoconf-dir=@var{dir} -@itemx -A +@itemx -A @var{dir} @evindex AC_MACRODIR Overwrite the location where Autoconf files were installed. You can also set the @code{AC_MACRODIR} environment variable to a directory; @@ -8113,7 +8150,7 @@ Report processing steps. Don't remove the temporary files. @item --autoconf-dir=@var{dir} -@itemx -A +@itemx -A @var{dir} @evindex AC_MACRODIR Overwrite the location where Autoconf files were installed. You can also set the @code{AC_MACRODIR} environment variable to a directory; diff --git a/ifnames.in b/ifnames.in index 208b7855..912cbfcc 100644 --- a/ifnames.in +++ b/ifnames.in @@ -36,7 +36,6 @@ space-separated list of the files in which that identifier occurs. -h, --help print this help, then exit -V, --version print version number, then exit - -v, --verbose verbosely report processing Report bugs to ." diff --git a/ifnames.sh b/ifnames.sh index 208b7855..912cbfcc 100644 --- a/ifnames.sh +++ b/ifnames.sh @@ -36,7 +36,6 @@ space-separated list of the files in which that identifier occurs. -h, --help print this help, then exit -V, --version print version number, then exit - -v, --verbose verbosely report processing Report bugs to ." diff --git a/man/autoconf.1 b/man/autoconf.1 index abf62728..2311a8c3 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -23,12 +23,6 @@ verbosely report processing \fB\-d\fR, \fB\-\-debug\fR don't remove temporary files .TP -\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR -directory storing Autoconf's macro files -.TP -\fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR -directory storing the `aclocal.m4' file -.TP \fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR save output in FILE (stdout is the default) .TP @@ -58,6 +52,13 @@ turn off all the warnings warnings are error .PP The environment variable `WARNINGS' is honored. +.SS "Library directories:" +.TP +\fB\-A\fR, \fB\-\-autoconf\-dir\fR=\fIACDIR\fR +Autoconf's macro files location (rarely needed) +.TP +\fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR +location of the `aclocal.m4' file .SS "Tracing:" .TP \fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR diff --git a/man/autoheader.1 b/man/autoheader.1 index 163e4945..9f4e99ce 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -32,6 +32,12 @@ obsolete constructs `all' all the warnings .TP +`no-CATEGORY' +turn off the warnings on CATEGORY +.TP +`none' +turn off all the warnings +.TP `error' warnings are error .SS "Library directories:" diff --git a/man/autoreconf.1 b/man/autoreconf.1 index e6057551..21db3557 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -43,9 +43,6 @@ other tools. \fB\-A\fR, \fB\-\-autoconf\-dir\fR=\fIACDIR\fR Autoconf's macro files location (rarely needed) .TP -\fB\-m\fR, \fB\-\-macro\-path\fR=\fIPATH\fR -library extensions files -.TP \fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR location of `aclocal.m4' and `acconfig.h' .TP @@ -70,9 +67,6 @@ set strictness to gnu .TP \fB\-\-include\-deps\fR include generated dependencies in Makefile.in -.TP -\fB\-i\fR -deprecated alias for \fB\-\-include\-deps\fR .PP The environment variables AUTOCONF, AUTOHEADER, AUTOMAKE, and ACLOCAL are honored. diff --git a/man/ifnames.1 b/man/ifnames.1 index c4a49ecd..3155a16d 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -17,9 +17,6 @@ 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 .SH AUTHOR Written by David J. MacKenzie and Paul Eggert. .PP