* 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.

diff --git a/ChangeLog b/ChangeLog
index a39cec0f93fcb931070f02473ab4e0218e377564..18877461b1dd752da4b3ab0b061aa5a3c949a556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-10-26  Pavel Roskin  <proski@gnu.org>
+
+       * 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  <akim@epita.fr>
 
        * shell.m4: Rename as...

diff --git a/autoconf.in b/autoconf.in
index c9b4856d323eb2ce8d3dda2649d44cdd0570b4df..c1e2022790bb98aaf7897dc18b0c1f042d5847d1 100644 (file)
--- 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 c9b4856d323eb2ce8d3dda2649d44cdd0570b4df..c1e2022790bb98aaf7897dc18b0c1f042d5847d1 100644 (file)
--- 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 1f83ec0e78e30cdd13aa03f4b44c8852c6389cbf..15efe2f2766e44fea5ac793e507d4096a721bf36 100644 (file)
--- 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 1f83ec0e78e30cdd13aa03f4b44c8852c6389cbf..15efe2f2766e44fea5ac793e507d4096a721bf36 100644 (file)
--- 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 7672d04e348f9bb142ded8d0faa3a7def15e2b9b..9d62774c9d9018f4cecdb019b4520baf816b36b5 100644 (file)
--- 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 7672d04e348f9bb142ded8d0faa3a7def15e2b9b..9d62774c9d9018f4cecdb019b4520baf816b36b5 100644 (file)
--- 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 c9b4856d323eb2ce8d3dda2649d44cdd0570b4df..c1e2022790bb98aaf7897dc18b0c1f042d5847d1 100644 (file)
--- 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 1f83ec0e78e30cdd13aa03f4b44c8852c6389cbf..15efe2f2766e44fea5ac793e507d4096a721bf36 100644 (file)
--- 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 7672d04e348f9bb142ded8d0faa3a7def15e2b9b..9d62774c9d9018f4cecdb019b4520baf816b36b5 100644 (file)
--- 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 208b785585299cf10f25b297a788b2ba530746ea..912cbfcce2581dba9cdd63378b70260695d9265d 100644 (file)
--- 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 <bug-autoconf@gnu.org>."
 

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 92cd48840535cce6fc98817c3f421cfd0cdeb928..59e7a4bc8f7f0274292f5793f406b9f14c0d836a 100644 (file)
--- 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 208b785585299cf10f25b297a788b2ba530746ea..912cbfcce2581dba9cdd63378b70260695d9265d 100644 (file)
--- 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 <bug-autoconf@gnu.org>."
 

diff --git a/ifnames.sh b/ifnames.sh
index 208b785585299cf10f25b297a788b2ba530746ea..912cbfcce2581dba9cdd63378b70260695d9265d 100644 (file)
--- 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 <bug-autoconf@gnu.org>."
 

diff --git a/man/autoconf.1 b/man/autoconf.1
index abf62728faaa363816b93ea84e245becf71b3171..2311a8c3431bebb95dce062db24822c084942e1b 100644 (file)
--- 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 163e494575edff3a88a7ecdf365a96c39a3e90a4..9f4e99ce3b3bc7783a64295fa2aa77ca2681718f 100644 (file)
--- 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 e60575513ebb776605e9da1c94a15a7409c33c85..21db3557445a092157bce4db4f112618b966b21f 100644 (file)
--- 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 c4a49ecd4562ecf7206d4a592dd58b340e988d9f..3155a16d45ec30f20f2fc4611a5e89c8d4fdaddd 100644 (file)
--- 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