mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-24 10:54:42 +08:00
Remove ac_ prefix from some variables set by options, for consistency
and backward compatibility.
This commit is contained in:
David MacKenzie
parent
32e63f6901
commit
bb4f095526
31
acgeneral.m4
31
acgeneral.m4
@ -33,7 +33,7 @@ dnl
|
||||
dnl Utility functions for stamping the configure script.
|
||||
dnl
|
||||
dnl
|
||||
define(AC_ACVERSION, 1.7.11)dnl
|
||||
define(AC_ACVERSION, 1.8)dnl
|
||||
dnl This is defined by the --version option of the autoconf script.
|
||||
ifdef([AC_PRINT_VERSION], [errprint(Autoconf version AC_ACVERSION
|
||||
)])dnl
|
||||
@ -108,23 +108,24 @@ Options: [defaults in brackets]
|
||||
changequote([,])dnl
|
||||
|
||||
# Initialize some variables set by options.
|
||||
# The variables have the same names as the options, with
|
||||
# dashes changed to underlines.
|
||||
build=NONE
|
||||
exec_prefix=
|
||||
host=NONE
|
||||
ac_no_create=
|
||||
no_create=
|
||||
nonopt=NONE
|
||||
ac_norecursion=
|
||||
norecursion=
|
||||
prefix=
|
||||
program_prefix=
|
||||
program_suffix=
|
||||
program_transform_name=
|
||||
ac_silent=
|
||||
site=
|
||||
silent=
|
||||
srcdir=
|
||||
target=NONE
|
||||
verbose=
|
||||
x_includes=
|
||||
x_libraries=
|
||||
ac_verbose=
|
||||
|
||||
ac_prev=
|
||||
for ac_option
|
||||
@ -137,7 +138,7 @@ do
|
||||
continue
|
||||
fi
|
||||
|
||||
# Accept (but ignore some of) the most important Cygnus configure
|
||||
# Accept (but ignore some of) the important Cygnus configure
|
||||
# options, so we can diagnose typos.
|
||||
|
||||
case "$ac_option" in
|
||||
@ -209,11 +210,11 @@ EOF
|
||||
|
||||
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
|
||||
| --no-cr | --no-c)
|
||||
ac_no_create=yes ;;
|
||||
no_create=yes ;;
|
||||
|
||||
-norecursion | --norecursion | --norecursio | --norecursi \
|
||||
| --norecurs | --norecur | --norecu | --norec | --nore | --nor)
|
||||
ac_norecursion=yes ;;
|
||||
norecursion=yes ;;
|
||||
|
||||
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
|
||||
ac_prev=prefix ;;
|
||||
@ -253,7 +254,7 @@ EOF
|
||||
|
||||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
ac_silent=yes ;;
|
||||
silent=yes ;;
|
||||
|
||||
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
|
||||
ac_prev=srcdir ;;
|
||||
@ -266,7 +267,7 @@ EOF
|
||||
target="$ac_optarg" ;;
|
||||
|
||||
-v | -verbose | --verbose | --verbos | --verbo | --verb)
|
||||
ac_verbose=yes ;;
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
echo "configure generated by autoconf version AC_ACVERSION"
|
||||
@ -527,7 +528,7 @@ define(AC_DEFINE,[
|
||||
{
|
||||
dnl Uniformly use AC_DEFINE_[SED]QUOTE, so callers of AC_DEFINE_UNQUOTED
|
||||
dnl can use AC_QUOTE_* manually if they want to.
|
||||
test -n "$ac_verbose" && \
|
||||
test -n "$verbose" && \
|
||||
ifelse($#, 2,
|
||||
[define([AC_VAL], $2)dnl
|
||||
echo " defining" $1 to be ifelse(AC_VAL,, empty, "AC_QUOTE_SQUOTE(AC_VAL)")],
|
||||
@ -583,10 +584,10 @@ dnl Printing messages
|
||||
dnl
|
||||
dnl
|
||||
define(AC_CHECKING,
|
||||
[test -n "$ac_silent" || echo "checking $1"])dnl
|
||||
[test -n "$silent" || echo "checking $1"])dnl
|
||||
dnl
|
||||
define(AC_VERBOSE,
|
||||
[test -n "$ac_verbose" && echo " $1"])dnl
|
||||
[test -n "$verbose" && echo " $1"])dnl
|
||||
dnl
|
||||
define(AC_WARN,
|
||||
[echo "configure: warning: $1" >&2])dnl
|
||||
@ -1048,7 +1049,7 @@ $2
|
||||
exit 0
|
||||
EOF
|
||||
chmod +x config.status
|
||||
test -n "$ac_no_create" || ${CONFIG_SHELL-/bin/sh} config.status
|
||||
test -n "$no_create" || ${CONFIG_SHELL-/bin/sh} config.status
|
||||
])dnl
|
||||
dnl This is a subroutine of AC_OUTPUT, broken out primarily to avoid bugs
|
||||
dnl with long definitions in GNU m4 1.0. This is called inside a quoted
|
||||
|
||||
@ -33,7 +33,7 @@ dnl
|
||||
dnl Utility functions for stamping the configure script.
|
||||
dnl
|
||||
dnl
|
||||
define(AC_ACVERSION, 1.7.11)dnl
|
||||
define(AC_ACVERSION, 1.8)dnl
|
||||
dnl This is defined by the --version option of the autoconf script.
|
||||
ifdef([AC_PRINT_VERSION], [errprint(Autoconf version AC_ACVERSION
|
||||
)])dnl
|
||||
@ -108,23 +108,24 @@ Options: [defaults in brackets]
|
||||
changequote([,])dnl
|
||||
|
||||
# Initialize some variables set by options.
|
||||
# The variables have the same names as the options, with
|
||||
# dashes changed to underlines.
|
||||
build=NONE
|
||||
exec_prefix=
|
||||
host=NONE
|
||||
ac_no_create=
|
||||
no_create=
|
||||
nonopt=NONE
|
||||
ac_norecursion=
|
||||
norecursion=
|
||||
prefix=
|
||||
program_prefix=
|
||||
program_suffix=
|
||||
program_transform_name=
|
||||
ac_silent=
|
||||
site=
|
||||
silent=
|
||||
srcdir=
|
||||
target=NONE
|
||||
verbose=
|
||||
x_includes=
|
||||
x_libraries=
|
||||
ac_verbose=
|
||||
|
||||
ac_prev=
|
||||
for ac_option
|
||||
@ -137,7 +138,7 @@ do
|
||||
continue
|
||||
fi
|
||||
|
||||
# Accept (but ignore some of) the most important Cygnus configure
|
||||
# Accept (but ignore some of) the important Cygnus configure
|
||||
# options, so we can diagnose typos.
|
||||
|
||||
case "$ac_option" in
|
||||
@ -209,11 +210,11 @@ EOF
|
||||
|
||||
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
|
||||
| --no-cr | --no-c)
|
||||
ac_no_create=yes ;;
|
||||
no_create=yes ;;
|
||||
|
||||
-norecursion | --norecursion | --norecursio | --norecursi \
|
||||
| --norecurs | --norecur | --norecu | --norec | --nore | --nor)
|
||||
ac_norecursion=yes ;;
|
||||
norecursion=yes ;;
|
||||
|
||||
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
|
||||
ac_prev=prefix ;;
|
||||
@ -253,7 +254,7 @@ EOF
|
||||
|
||||
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
ac_silent=yes ;;
|
||||
silent=yes ;;
|
||||
|
||||
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
|
||||
ac_prev=srcdir ;;
|
||||
@ -266,7 +267,7 @@ EOF
|
||||
target="$ac_optarg" ;;
|
||||
|
||||
-v | -verbose | --verbose | --verbos | --verbo | --verb)
|
||||
ac_verbose=yes ;;
|
||||
verbose=yes ;;
|
||||
|
||||
-version | --version | --versio | --versi | --vers)
|
||||
echo "configure generated by autoconf version AC_ACVERSION"
|
||||
@ -527,7 +528,7 @@ define(AC_DEFINE,[
|
||||
{
|
||||
dnl Uniformly use AC_DEFINE_[SED]QUOTE, so callers of AC_DEFINE_UNQUOTED
|
||||
dnl can use AC_QUOTE_* manually if they want to.
|
||||
test -n "$ac_verbose" && \
|
||||
test -n "$verbose" && \
|
||||
ifelse($#, 2,
|
||||
[define([AC_VAL], $2)dnl
|
||||
echo " defining" $1 to be ifelse(AC_VAL,, empty, "AC_QUOTE_SQUOTE(AC_VAL)")],
|
||||
@ -583,10 +584,10 @@ dnl Printing messages
|
||||
dnl
|
||||
dnl
|
||||
define(AC_CHECKING,
|
||||
[test -n "$ac_silent" || echo "checking $1"])dnl
|
||||
[test -n "$silent" || echo "checking $1"])dnl
|
||||
dnl
|
||||
define(AC_VERBOSE,
|
||||
[test -n "$ac_verbose" && echo " $1"])dnl
|
||||
[test -n "$verbose" && echo " $1"])dnl
|
||||
dnl
|
||||
define(AC_WARN,
|
||||
[echo "configure: warning: $1" >&2])dnl
|
||||
@ -1048,7 +1049,7 @@ $2
|
||||
exit 0
|
||||
EOF
|
||||
chmod +x config.status
|
||||
test -n "$ac_no_create" || ${CONFIG_SHELL-/bin/sh} config.status
|
||||
test -n "$no_create" || ${CONFIG_SHELL-/bin/sh} config.status
|
||||
])dnl
|
||||
dnl This is a subroutine of AC_OUTPUT, broken out primarily to avoid bugs
|
||||
dnl with long definitions in GNU m4 1.0. This is called inside a quoted
|
||||
|
||||
Loading…
Reference in New Issue
Block a user