mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2024-12-09 02:10:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

* lib/autoconf/general.m4 (AC_ARG_ENABLE): Print help about

Browse Source 
--disable-option-checking to --help output even when
AC_PRESERVE_HELP_ORDER is not used.
(_AC_INIT_PARSE_ENABLE2): Print warnings using actual --enable or
--with argument, rather than argument with [-.] replaced by
underscores.
* NEWS: Fix typo in previous change; the news was in the
wrong section.
This commit is contained in:
Paul Eggert 2006-12-19 05:41:18 +00:00
parent 30e83f87f8
commit 4a51103c6c
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-12-18 Steven G. Johnson <stevenj@alum.mit.edu>
* lib/autoconf/general.m4 (AC_ARG_ENABLE): Print help about
--disable-option-checking to --help output even when
AC_PRESERVE_HELP_ORDER is not used.
(_AC_INIT_PARSE_ENABLE2): Print warnings using actual --enable or
--with argument, rather than argument with [-.] replaced by
underscores.
* NEWS: Fix typo in previous change; the news was in the
wrong section.
2006-12-18 Paul Eggert <eggert@cs.ucla.edu> 2006-12-18 Paul Eggert <eggert@cs.ucla.edu>
* NEWS: Warnings are now generated by default for unknown * NEWS: Warnings are now generated by default for unknown

10
NEWS
View File

@ -1,6 +1,9 @@
* Major changes in Autoconf 2.61b (????-??-??) * Major changes in Autoconf 2.61b (????-??-??)
** None yet... ** Warnings are now generated by default when an installer invokes
'configure' with an unknown --enable-* or --with-* option.
These warnings can be disabled with the new AC_DISABLE_OPTION_CHECKING
macro, or by invoking 'configure' with --disable-option-checking.
* Major changes in Autoconf 2.61a (2006-12-11) * Major changes in Autoconf 2.61a (2006-12-11)
@ -14,11 +17,6 @@
on some modern systems and could no longer be maintained reliably on some modern systems and could no longer be maintained reliably
due to lack of ancient systems to test it on. due to lack of ancient systems to test it on.
** Warnings are now generated by default when an installer invokes
'configure' with an unknown --enable-* or --with-* option.
These warnings can be disabled with the new AC_DISABLE_OPTION_CHECKING
macro, or by invoking 'configure' with --disable-option-checking.
** config.status now uses awk instead of sed for most substitutions, for speed. ** config.status now uses awk instead of sed for most substitutions, for speed.
- As a side effect multi-line values of substituted variables no - As a side effect multi-line values of substituted variables no

4
lib/autoconf/general.m4
View File

@ -957,10 +957,11 @@ m4_define([_AC_INIT_PARSE_ENABLE2],
expr "x$ac_useropt" : "[.*[^-._$as_cr_alnum]]" >/dev/null && expr "x$ac_useropt" : "[.*[^-._$as_cr_alnum]]" >/dev/null &&
AC_MSG_ERROR( AC_MSG_ERROR(
[invalid ]m4_if([$2], [with], [package], [feature])[ name: $ac_useropt]) [invalid ]m4_if([$2], [with], [package], [feature])[ name: $ac_useropt])
ac_useropt_orig=$ac_useropt
ac_useropt=`AS_ECHO(["$ac_useropt"]) | sed 's/[[-.]]/_/g'` ac_useropt=`AS_ECHO(["$ac_useropt"]) | sed 's/[[-.]]/_/g'`
case $ac_user_opts in case $ac_user_opts in
*:$2_$ac_useropt:*) ;; *:$2_$ac_useropt:*) ;;
*) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--$1-$ac_useropt" *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--$1-$ac_useropt_orig"
ac_unrecognized_sep=', ';; ac_unrecognized_sep=', ';;
esac esac
eval $2_$ac_useropt=m4_if([$1], [$2], [\$ac_optarg], [no]) ;;dnl eval $2_$ac_useropt=m4_if([$1], [$2], [\$ac_optarg], [no]) ;;dnl
@ -1401,6 +1402,7 @@ AC_DEFUN([AC_ARG_ENABLE],
[], [],
[m4_divert_once([HELP_ENABLE], [[ [m4_divert_once([HELP_ENABLE], [[
Optional Features: Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]]])])dnl --enable-FEATURE[=ARG] include FEATURE [ARG=yes]]])])dnl
m4_divert_once([HELP_ENABLE], [$2])dnl m4_divert_once([HELP_ENABLE], [$2])dnl