X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.charset;h=b91e0591b863dcc1448ebf914bf9ddd101f4d59a;hb=e30534ef7f3959dae83eb750d44186a7b9b56c73;hp=0844094875a8305e312e8e6349039caa90577f3a;hpb=b98afd70eea2651832f67b9d637a14f64a1b334c;p=gnulib.git

diff --git a/lib/config.charset b/lib/config.charset
index 084409487..b91e0591b 100755
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2002 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
@@ -174,7 +174,7 @@ case "$os" in
 	echo "eucTW EUC-TW"
 	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "utf8 UTF-8"
 	;;
     irix*)
@@ -209,7 +209,7 @@ case "$os" in
 	echo "GBK GBK"
 	echo "KSC5601 CP949"
 	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "TACTIS TIS-620"
 	echo "UTF-8 UTF-8"
 	;;
@@ -230,15 +230,17 @@ case "$os" in
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
+	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
 	;;
-    freebsd*)
+    freebsd* | os2*)
 	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
+	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+	# reuse FreeBSD's locale data for OS/2.
 	echo "C ASCII"
 	echo "US-ASCII ASCII"
 	for l in la_LN lt_LN; do
@@ -266,13 +268,13 @@ case "$os" in
 	echo "zh_TW.Big5 BIG5"
 	echo "zh_CN.EUC GB2312"
 	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "C UTF-8"
+	echo "* UTF-8"
 	;;
     msdosdjgpp*)
 	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore