Merge branch 'gawk-4.1-stable'

3 files changed, 9 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 3c4a386f..aa0ddcbe 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-12         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (charset-msg-start): Add a list of needed locales.
+	Suggested by Shaun Jackman <sjackman@gmail.com>.
+
 2014-10-05         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* profile2.ok, profile3.ok, profile4.ok, profile5.ok:
diff --git a/test/Makefile.am b/test/Makefile.am
index 74784659..81548186 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1168,6 +1168,8 @@ charset-msg-start:
 	@echo "************************************************"
 	@echo "** Some or all of these tests may fail if you **"
 	@echo "** have inadequate or missing locale support  **"
+	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
+	@echo "** ja_JP.UTF-8 are needed.                    **"
 	@echo "************************************************"
 
 charset-msg-end:
diff --git a/test/Makefile.in b/test/Makefile.in
index f9a3be28..8d7790f4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1595,6 +1595,8 @@ charset-msg-start:
 	@echo "************************************************"
 	@echo "** Some or all of these tests may fail if you **"
 	@echo "** have inadequate or missing locale support  **"
+	@echo "** At least en_US.UTF-8, ru_RU.UTF-8 and      **"
+	@echo "** ja_JP.UTF-8 are needed.                    **"
 	@echo "************************************************"
 
 charset-msg-end: