mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-18 10:45:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

* autoconf.sh (--warnings): Catch no-category', not nocategory'.

Browse Source 
* autoheader.sh: Likewise.
* acgeneral.m4 (_AC_WARNING_IFELSE): Adjust.
This commit is contained in:
Akim Demaille 2000-07-28 07:41:52 +00:00
parent 31539fee31
commit b64f36dee1
11 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2000-07-28 Akim Demaille <akim@epita.fr>
* autoconf.sh (--warnings): Catch `no-category', not `nocategory'.
* autoheader.sh: Likewise.
* acgeneral.m4 (_AC_WARNING_IFELSE): Adjust.
2000-07-28 Akim Demaille <akim@epita.fr>
* doc/autoconf.texi (Installation Directory Variables): New

10
acgeneral.m4
View File

@ -2525,11 +2525,11 @@ define([AC_WARNING_IFELSE],
# --------------------------------------------------------------
# Implementation of the loop described above.
define([_AC_WARNING_IFELSE],
[ifelse([$4], [$1], [$2],
[$4], [all], [$2],
[$4], [], [$3],
[$4], [none], [$3],
[$4], [no$1], [$3],
[ifelse([$4], [$1], [$2],
[$4], [all], [$2],
[$4], [], [$3],
[$4], [none], [$3],
[$4], [no-$1], [$3],
[$0([$1], [$2], [$3], m4_shiftn(4, $@))])])

19
autoconf.in
View File

@ -41,13 +41,13 @@ Operation modes:
-W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
Warning categories include:
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`noCATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`no-CATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
The environment variable \`WARNINGS' is honored.
@ -202,10 +202,7 @@ while test $# -gt 0 ; do
shift
warnings=$warnings,$1
shift ;;
--warnings=* )
warnings=$warnings,$optarg
shift ;;
-W* ) # People are used to -Wall, -Werror etc.
--warnings=* | -W* )
warnings=$warnings,$optarg
shift ;;

19
autoconf.sh
View File

@ -41,13 +41,13 @@ Operation modes:
-W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
Warning categories include:
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`noCATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`no-CATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
The environment variable \`WARNINGS' is honored.
@ -202,10 +202,7 @@ while test $# -gt 0 ; do
shift
warnings=$warnings,$1
shift ;;
--warnings=* )
warnings=$warnings,$optarg
shift ;;
-W* ) # People are used to -Wall, -Werror etc.
--warnings=* | -W* )
warnings=$warnings,$optarg
shift ;;

20
autoheader.in
View File

@ -96,7 +96,8 @@ warning_obsolete=false
# Parse command line.
while test $# -gt 0 ; do
optarg=`expr "$1" : '-[^=]*=\(.*\)'`
optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
"$1" : '-.\(.*\)'`
case $1 in
--version | --vers* | -V )
echo "$version" ; exit 0 ;;
@ -140,10 +141,10 @@ while test $# -gt 0 ; do
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
warnings=$warnings,$1
shift ;;
--warnings=* | -W*)
warnings="$warnings "`echo "$optarg" | sed -e 's/,/ /g'`
warnings=$warnings,$optarg
shift ;;
-- ) # Stop option processing
@ -160,11 +161,16 @@ while test $# -gt 0 ; do
esac
done
# Decode `$warnings'.
for i in :$warnings
# The warnings are the concatenation of 1. application's defaults
# (here, none), 2. $WARNINGS, $3 command line options, in that order.
_ac_warnings=
for warning in `IFS=,; echo $WARNINGS,$warnings | tr 'A-Z' 'a-z'`
do
test "$i" = : && continue
eval "warning_$i=:"
case $warning in
'') continue;;
no-*) eval warning_`expr x$warning : 'xno-\(.*\)'`=false;;
*) eval warning_$warning=:;;
esac
done
# Trap on 0 to stop playing with `rm'.

20
autoheader.sh
View File

@ -96,7 +96,8 @@ warning_obsolete=false
# Parse command line.
while test $# -gt 0 ; do
optarg=`expr "$1" : '-[^=]*=\(.*\)'`
optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
"$1" : '-.\(.*\)'`
case $1 in
--version | --vers* | -V )
echo "$version" ; exit 0 ;;
@ -140,10 +141,10 @@ while test $# -gt 0 ; do
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
warnings=$warnings,$1
shift ;;
--warnings=* | -W*)
warnings="$warnings "`echo "$optarg" | sed -e 's/,/ /g'`
warnings=$warnings,$optarg
shift ;;
-- ) # Stop option processing
@ -160,11 +161,16 @@ while test $# -gt 0 ; do
esac
done
# Decode `$warnings'.
for i in :$warnings
# The warnings are the concatenation of 1. application's defaults
# (here, none), 2. $WARNINGS, $3 command line options, in that order.
_ac_warnings=
for warning in `IFS=,; echo $WARNINGS,$warnings | tr 'A-Z' 'a-z'`
do
test "$i" = : && continue
eval "warning_$i=:"
case $warning in
'') continue;;
no-*) eval warning_`expr x$warning : 'xno-\(.*\)'`=false;;
*) eval warning_$warning=:;;
esac
done
# Trap on 0 to stop playing with `rm'.

19
bin/autoconf.in
View File

@ -41,13 +41,13 @@ Operation modes:
-W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax]
Warning categories include:
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`noCATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
\`cross' cross compilation issues
\`obsolete' obsolete constructs
\`syntax' dubious syntactic constructs
\`all' all the warnings
\`no-CATEGORY' turn off the warnings on CATEGORY
\`none' turn off all the warnings
\`error' warnings are error
The environment variable \`WARNINGS' is honored.
@ -202,10 +202,7 @@ while test $# -gt 0 ; do
shift
warnings=$warnings,$1
shift ;;
--warnings=* )
warnings=$warnings,$optarg
shift ;;
-W* ) # People are used to -Wall, -Werror etc.
--warnings=* | -W* )
warnings=$warnings,$optarg
shift ;;

20
bin/autoheader.in
View File

@ -96,7 +96,8 @@ warning_obsolete=false
# Parse command line.
while test $# -gt 0 ; do
optarg=`expr "$1" : '-[^=]*=\(.*\)'`
optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
"$1" : '-.\(.*\)'`
case $1 in
--version | --vers* | -V )
echo "$version" ; exit 0 ;;
@ -140,10 +141,10 @@ while test $# -gt 0 ; do
--warnings | -W )
test $# = 1 && eval "$exit_missing_arg"
shift
warnings="$warnings "`echo $1 | sed -e 's/,/ /g'`
warnings=$warnings,$1
shift ;;
--warnings=* | -W*)
warnings="$warnings "`echo "$optarg" | sed -e 's/,/ /g'`
warnings=$warnings,$optarg
shift ;;
-- ) # Stop option processing
@ -160,11 +161,16 @@ while test $# -gt 0 ; do
esac
done
# Decode `$warnings'.
for i in :$warnings
# The warnings are the concatenation of 1. application's defaults
# (here, none), 2. $WARNINGS, $3 command line options, in that order.
_ac_warnings=
for warning in `IFS=,; echo $WARNINGS,$warnings | tr 'A-Z' 'a-z'`
do
test "$i" = : && continue
eval "warning_$i=:"
case $warning in
'') continue;;
no-*) eval warning_`expr x$warning : 'xno-\(.*\)'`=false;;
*) eval warning_$warning=:;;
esac
done
# Trap on 0 to stop playing with `rm'.

4
doc/autoconf.texi
View File

@ -971,7 +971,7 @@ report none
@item error
treats warnings as errors
@item no@var{category}
@item no-@var{category}
disable warnings falling into @var{category}
@end table
@ -2150,7 +2150,7 @@ report none
@item error
treats warnings as errors
@item no@var{category}
@item no-@var{category}
disable warnings falling into @var{category}
@end table

10
lib/autoconf/general.m4
View File

@ -2525,11 +2525,11 @@ define([AC_WARNING_IFELSE],
# --------------------------------------------------------------
# Implementation of the loop described above.
define([_AC_WARNING_IFELSE],
[ifelse([$4], [$1], [$2],
[$4], [all], [$2],
[$4], [], [$3],
[$4], [none], [$3],
[$4], [no$1], [$3],
[ifelse([$4], [$1], [$2],
[$4], [all], [$2],
[$4], [], [$3],
[$4], [none], [$3],
[$4], [no-$1], [$3],
[$0([$1], [$2], [$3], m4_shiftn(4, $@))])])

2
man/autoconf.1
View File

@ -48,7 +48,7 @@ dubious syntactic constructs
`all'
all the warnings
.TP
`noCATEGORY'
`no-CATEGORY'
turn off the warnings on CATEGORY
.TP
`none'