From 29577449a18c6d97285f1f6ba67a00f7c00d2792 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 14:17:14 +0000
Subject: Use utf-8 as default encoding for configuration information

---
 unix/README     | 2 +-
 unix/configure  | 4 ++--
 unix/tcl.m4     | 4 ++--
 win/configure   | 3 +--
 win/makefile.vc | 2 +-
 win/rules.vc    | 2 +-
 win/tcl.m4      | 3 +--
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/unix/README b/unix/README
index 3340dc6..3c1a207 100644
--- a/unix/README
+++ b/unix/README
@@ -91,7 +91,7 @@ How To Compile And Install Tcl:
 				for descriptions of the probes made available,
 				see http://wiki.tcl.tk/DTrace for more details
 	--with-encoding=ENCODING Specifies the encoding for compile-time
-				configuration values. Defaults to iso8859-1,
+				configuration values. Defaults to utf-8,
 				which is also sufficient for ASCII.
 	--with-tzdata=FLAG	Specifies whether to install timezone data. By
 				default, the configure script tries to detect
diff --git a/unix/configure b/unix/configure
index d3a4856..d48d687 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1430,7 +1430,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-encoding         encoding for configuration values (default:
-                          iso8859-1)
+                          utf-8)
   --with-system-libtommath
                           use external libtommath (default: true if available,
                           false otherwise)
@@ -3982,7 +3982,7 @@ _ACEOF
 
     else
 
-$as_echo "#define TCL_CFGVAL_ENCODING \"iso8859-1\"" >>confdefs.h
+$as_echo "#define TCL_CFGVAL_ENCODING \"utf-8\"" >>confdefs.h
 
     fi
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 056cf1f..a4824ff 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2445,14 +2445,14 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
 AC_DEFUN([SC_TCL_CFG_ENCODING], [
     AC_ARG_WITH(encoding,
 	AC_HELP_STRING([--with-encoding],
-	    [encoding for configuration values (default: iso8859-1)]),
+	    [encoding for configuration values (default: utf-8)]),
 	with_tcencoding=${withval})
 
     if test x"${with_tcencoding}" != x ; then
 	AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}",
 	    [What encoding should be used for embedded configuration info?])
     else
-	AC_DEFINE(TCL_CFGVAL_ENCODING,"iso8859-1",
+	AC_DEFINE(TCL_CFGVAL_ENCODING,"utf-8",
 	    [What encoding should be used for embedded configuration info?])
     fi
 ])
diff --git a/win/configure b/win/configure
index f099510..b08eb15 100755
--- a/win/configure
+++ b/win/configure
@@ -3749,8 +3749,7 @@ fi
 _ACEOF
 
     else
-	# Default encoding on windows is not "iso8859-1"
-	$as_echo "#define TCL_CFGVAL_ENCODING \"cp1252\"" >>confdefs.h
+	$as_echo "#define TCL_CFGVAL_ENCODING \"utf-8\"" >>confdefs.h
 
     fi
 
diff --git a/win/makefile.vc b/win/makefile.vc
index e3de98e..0edeac1 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -116,7 +116,7 @@
 #
 #	CFG_ENCODING=encoding
 #		name of encoding for configuration information. Defaults
-#		to cp1252
+#		to utf-8
 #
 # Examples:
 #       c:\tcl_src\win\>nmake -f makefile.vc release
diff --git a/win/rules.vc b/win/rules.vc
index 61df910..33d6075 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -504,7 +504,7 @@ _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 !endif
 
 !ifndef CFG_ENCODING
-CFG_ENCODING	= \"cp1252\"
+CFG_ENCODING	= \"utf-8\"
 !endif
 
 ################################################################
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4824e8e..0fd2271 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1085,8 +1085,7 @@ AC_DEFUN([SC_TCL_CFG_ENCODING], [
     if test x"${with_tcencoding}" != x ; then
 	AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}")
     else
-	# Default encoding on windows is not "iso8859-1"
-	AC_DEFINE(TCL_CFGVAL_ENCODING,"cp1252")
+	AC_DEFINE(TCL_CFGVAL_ENCODING,"utf-8")
     fi
 ])
 
-- 
cgit v0.12