From 78f044cf3c081ec5840ad6e07cf2e3d33f2c227e Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand" Date: Wed, 16 Jun 2021 08:30:15 +0200 Subject: Disambiguate what user sees in interactive Configure User should expect to see configuration questions spelled 'UTF-8', not 'UTF8' (even if we store information internally or in config.sh without the hyphen). Correct user prompts accordingly. For: #18844 https://github.com/Perl/perl5/pull/18870 by @jkeenan --- Configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Configure') diff --git a/Configure b/Configure index 197d129180..32a02544b7 100755 --- a/Configure +++ b/Configure @@ -18195,7 +18195,7 @@ case $d_setlocale in echo "Your system has setlocale()..." >&4 $run ./try case $? in - 0) echo "and it seems sane; you don't have a C.UTF8 locale" >&4 + 0) echo "and it seems sane; you don't have a C.UTF-8 locale" >&4 d_setlocale="$define" d_setlocale_accepts_any_locale_name="$undef" d_has_C_UTF8="false" @@ -18205,7 +18205,7 @@ case $d_setlocale in d_setlocale_accepts_any_locale_name="$define" d_has_C_UTF8="false" ;; - 2) echo "and it seems sane; you have a C.UTF8 locale" >&4 + 2) echo "and it seems sane; you have a C.UTF-8 locale" >&4 d_setlocale="$define" d_setlocale_accepts_any_locale_name="$undef" d_has_C_UTF8="true" @@ -18237,12 +18237,12 @@ $rm_try $undef) echo "There may be other ways to set the locale on your system, so we need to ask:" >&4 ;; esac - rp="Does your system have the C.UTF8 locale?" + rp="Does your system have the C.UTF-8 locale?" dflt=n . ./myread case "$ans" in [Yy]*) d_has_C_UTF8="true" - c_utf8_locale=" or C.UTF8" + c_utf8_locale=" or C.UTF-8" ;; *) d_has_C_UTF8="false" c_utf8_locale="" -- cgit v1.2.1