* autoconf.sh (option handling): Give a more understandable

message when an option is missing its argument.
* autoreconf.sh: Likewise.
* autoupdate.sh: Likewise.
* autoheader.sh: Likewise.
This commit is contained in:
Akim Demaille 2000-06-15 11:33:04 +00:00
parent f5a508569f
commit f3ace9be03
13 changed files with 86 additions and 33 deletions

View File

@ -1,3 +1,11 @@
2000-06-15 Akim Demaille <akim@epita.fr>
* autoconf.sh (option handling): Give a more understandable
message when an option is missing its argument.
* autoreconf.sh: Likewise.
* autoupdate.sh: Likewise.
* autoheader.sh: Likewise.
2000-06-13 Akim Demaille <akim@epita.fr>
`./config.status -d' is buggy.

View File

@ -66,6 +66,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -138,8 +143,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -147,8 +152,8 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
@ -157,9 +162,9 @@ while test $# -gt 0 ; do
shift;;
--trace | -t )
test $# = 1 && eval "$exit_missing_arg"
task=trace
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'"
shift ;;
--trace=* )
@ -172,8 +177,8 @@ while test $# -gt 0 ; do
shift;;
--output | -o )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
outfile=$1
shift ;;
--output=* )
@ -181,8 +186,8 @@ while test $# -gt 0 ; do
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -66,6 +66,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -138,8 +143,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -147,8 +152,8 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
@ -157,9 +162,9 @@ while test $# -gt 0 ; do
shift;;
--trace | -t )
test $# = 1 && eval "$exit_missing_arg"
task=trace
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'"
shift ;;
--trace=* )
@ -172,8 +177,8 @@ while test $# -gt 0 ; do
shift;;
--output | -o )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
outfile=$1
shift ;;
--output=* )
@ -181,8 +186,8 @@ while test $# -gt 0 ; do
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -104,8 +109,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -113,14 +118,14 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -104,8 +109,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -113,14 +118,14 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -106,8 +111,8 @@ while test $# -gt 0; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -115,8 +120,8 @@ while test $# -gt 0; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -106,8 +111,8 @@ while test $# -gt 0; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -115,8 +120,8 @@ while test $# -gt 0; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;

View File

@ -66,6 +66,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -138,8 +143,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -147,8 +152,8 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
@ -157,9 +162,9 @@ while test $# -gt 0 ; do
shift;;
--trace | -t )
test $# = 1 && eval "$exit_missing_arg"
task=trace
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
traces="$traces '"`echo "$1" | sed "s/'/'\\\\\\\\''/g"`"'"
shift ;;
--trace=* )
@ -172,8 +177,8 @@ while test $# -gt 0 ; do
shift;;
--output | -o )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
outfile=$1
shift ;;
--output=* )
@ -181,8 +186,8 @@ while test $# -gt 0 ; do
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -104,8 +109,8 @@ while test $# -gt 0 ; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -113,14 +118,14 @@ while test $# -gt 0 ; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
shift ;;
--warnings=* )

View File

@ -57,6 +57,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="\
Try \`$me --help' for more information."
exit_missing_arg="\
echo \"$me: option \\\`\$1' requires an argument\" >&2
echo \"\$help\" >&2
exit 1"
# NLS nuisances.
# Only set these to C if already set. These must not be set unconditionally
# because not all systems understand e.g. LANG=C (notably SCO).
@ -106,8 +111,8 @@ while test $# -gt 0; do
localdir=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--localdir | --l* | -l )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
localdir=$1
shift ;;
@ -115,8 +120,8 @@ while test $# -gt 0; do
AC_MACRODIR=`echo "$1" | sed -e 's/^[^=]*=//'`
shift ;;
--macrodir | --m* | -m )
test $# = 1 && eval "$exit_missing_arg"
shift
test $# = 0 && { echo "$help" >&2; exit 1; }
AC_MACRODIR=$1
shift ;;

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020.
.TH AUTOHEADER "1" "May 2000" "GNU autoconf 2.14a" FSF
.TH AUTOHEADER "1" "June 2000" "GNU autoconf 2.14a" FSF
.SH NAME
autoheader \- Create a template header for configure
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020.
.TH AUTORECONF "1" "May 2000" "GNU autoconf 2.14a" FSF
.TH AUTORECONF "1" "June 2000" "GNU autoconf 2.14a" FSF
.SH NAME
autoreconf \- Update generated configuration files
.SH SYNOPSIS

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020.
.TH AUTOUPDATE "1" "May 2000" "GNU autoconf 2.14a" FSF
.TH AUTOUPDATE "1" "June 2000" "GNU autoconf 2.14a" FSF
.SH NAME
autoupdate \- Update a configure.in to a newer Autoconf
.SH SYNOPSIS