[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Fix for usage information and argument passing
|
From: |
Pavel Roskin |
|
Subject: |
FYI: Fix for usage information and argument passing |
|
Date: |
Thu, 26 Oct 2000 19:36:25 -0400 (EDT) |
Hello!
I went through all the options in all the tools and fixed all the
inconsistencies. So it became a larger patch than originally thought.
The patch is already applied, but actually I regret that I did it. I
should have asked first. Further fix is needed, but this time I would
like to ask.
So, this is the original patch that was applied - just in case. The patch
that still needs to be applied follows in the next message.
Regards,
Pavel Roskin
__________________________________
Index: ChangeLog
===================================================================
RCS file: /cvs/autoconf/ChangeLog,v
retrieving revision 1.961
diff -u -r1.961 ChangeLog
--- ChangeLog 2000/10/26 09:52:34 1.961
+++ ChangeLog 2000/10/26 21:55:54
@@ -1,3 +1,18 @@
+2000-10-26 Pavel Roskin <address@hidden>
+
+ * 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 <address@hidden>
* shell.m4: Rename as...
Index: autoconf.sh
===================================================================
RCS file: /cvs/autoconf/autoconf.sh,v
retrieving revision 1.93
diff -u -r1.93 autoconf.sh
--- autoconf.sh 2000/10/16 18:25:56 1.93
+++ autoconf.sh 2000/10/26 21:55:54
@@ -36,8 +36,6 @@
-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 @@
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,58 +153,55 @@
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
Index: autoheader.sh
===================================================================
RCS file: /cvs/autoconf/autoheader.sh,v
retrieving revision 1.84
diff -u -r1.84 autoheader.sh
--- autoheader.sh 2000/10/23 18:32:18 1.84
+++ autoheader.sh 2000/10/26 21:55:54
@@ -40,9 +40,11 @@
-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,32 +124,32 @@
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
Index: autoreconf.sh
===================================================================
RCS file: /cvs/autoconf/autoreconf.sh,v
retrieving revision 1.54
diff -u -r1.54 autoreconf.sh
--- autoreconf.sh 2000/10/16 18:25:56 1.54
+++ autoreconf.sh 2000/10/26 21:55:54
@@ -44,7 +44,6 @@
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 @@
--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 @@
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 @@
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.
Index: autoupdate.sh
===================================================================
RCS file: /cvs/autoconf/autoupdate.sh,v
retrieving revision 1.37
diff -u -r1.37 autoupdate.sh
--- autoupdate.sh 2000/10/25 21:10:24 1.37
+++ autoupdate.sh 2000/10/26 21:55:54
@@ -125,32 +125,32 @@
verbose=echo
shift;;
+ --localdir=* | --l*=* | -l* )
+ localdir=$optarg
+ shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
localdir=$1
shift ;;
- --localdir=* | --l*=* | -l* )
- localdir=$optarg
- shift ;;
+ --autoconf-dir=* | --a*=* )
+ autoconf_dir=$optarg
+ shift ;;
--autoconf-dir | -A )
test $# = 1 && eval "$exit_missing_arg"
shift
autoconf_dir=$1
shift ;;
- --autoconf-dir=* | -A* )
- autoconf_dir=$optarg
+ --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" >&1
+ echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&2
test $# = 1 && eval "$exit_missing_arg"
shift
autoconf_dir=$1
- shift ;;
- --macrodir=* | --m*=* | -m*)
- echo "$me: warning: --macrodir is obsolete, use --autoconf-dir" >&1
- autoconf_dir=$optarg
shift ;;
-- )
Index: ifnames.sh
===================================================================
RCS file: /cvs/autoconf/ifnames.sh,v
retrieving revision 1.18
diff -u -r1.18 ifnames.sh
--- ifnames.sh 2000/10/16 18:25:56 1.18
+++ ifnames.sh 2000/10/26 21:55:54
@@ -36,7 +36,6 @@
-h, --help print this help, then exit
-V, --version print version number, then exit
- -v, --verbose verbosely report processing
Report bugs to <address@hidden>."
Index: doc/autoconf.texi
===================================================================
RCS file: /cvs/autoconf/doc/autoconf.texi,v
retrieving revision 1.370
diff -u -r1.370 autoconf.texi
--- doc/autoconf.texi 2000/10/20 00:15:34 1.370
+++ doc/autoconf.texi 2000/10/26 21:55:55
@@ -877,7 +877,7 @@
symbols it finds in them. This output can be voluminous.
@item address@hidden
address@hidden -A
address@hidden -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 @@
Don't remove the temporary files.
@item address@hidden
address@hidden -A
address@hidden -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 @@
newer than their input files (@file{configure.in} and, if present,
@file{aclocal.m4}).
address@hidden --install
address@hidden -i
+Copy missing auxiliary files. This option is similar to the option
address@hidden in @code{automake}.
+
address@hidden --symlink
address@hidden -s
+Instead of copying missing auxiliary files, install symbolic links.
+
@item address@hidden
@itemx -l @var{dir}
Have @code{autoconf} and @code{autoheader} look for the package files
@@ -1216,7 +1225,7 @@
@var{dir} instead of in the directory containing each @file{configure.in}.
@item address@hidden
address@hidden -A
address@hidden -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 is rarely needed and dangerous: only when you play with
different versions of Autoconf.
+
address@hidden address@hidden
address@hidden -M @var{dir}
+Specify location of additional macro files (@file{m4} by default).
address@hidden table
+
+Additionally, the following options are recognized and passed to
address@hidden:
+
address@hidden @option
address@hidden --cygnus
+Assume program is part of Cygnus-style tree.
+
address@hidden --foreign
+Set strictness to foreign.
+
address@hidden --gnits
+Set strictness to gnits.
+
address@hidden --gnu
+Set strictness to gnu.
+
address@hidden --include-deps
+Include generated dependencies in @file{Makefile.in}.
@end table
@@ -2153,8 +2186,12 @@
@itemx -d
Don't remove the temporary files.
address@hidden --verbose
address@hidden -v
+Report processing steps.
+
@item address@hidden
address@hidden -A
address@hidden -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 @@
Don't remove the temporary files.
@item address@hidden
address@hidden -A
address@hidden -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;
__________________________________
- FYI: Fix for usage information and argument passing,
Pavel Roskin <=