X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.charset;h=f02862164a92a31e98df18d5b40f9cf5898291cf;hb=43b11415979758aef2b3a58f058086ae01909a9f;hp=cd1999a14aa3217575335bd6778186e1ddffcba8;hpb=059ec3234efe7c440b08d170149ab6bd9a3e6ea1;p=gnulib.git

diff --git a/lib/config.charset b/lib/config.charset
index cd1999a14..f02862164 100755
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -31,32 +31,34 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name                         used by which systems         a MIME name?
-#   ASCII                     glibc solaris
-#   ISO-8859-1                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-2                glibc aix hpux irix solaris               yes
+#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
+#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-2                glibc aix hpux irix solaris freebsd       yes
 #   ISO-8859-4                solaris                                   yes
 #   ISO-8859-5                glibc aix hpux irix solaris               yes
-#   ISO-8859-6                aix hpux solaris                          yes
+#   ISO-8859-6                glibc aix hpux solaris                    yes
 #   ISO-8859-7                glibc aix hpux irix osf solaris           yes
 #   ISO-8859-8                glibc aix hpux solaris                    yes
 #   ISO-8859-9                glibc aix hpux irix osf solaris           yes
 #   ISO-8859-13               glibc
-#   ISO-8859-15               aix solaris
-#   KOI8-R                    glibc solaris                             yes
+#   ISO-8859-15               aix solaris freebsd
+#   KOI8-R                    glibc solaris freebsd                     yes
 #   KOI8-U                    glibc                                     yes
 #   CP850                     aix osf
 #   CP856                     aix
+#   CP866                     freebsd
 #   CP922                     aix
 #   CP932                     aix
 #   CP943                     aix
 #   CP1046                    aix
 #   CP1124                    aix
 #   CP1129                    aix
+#   CP1251                    glibc
 #   CP1252                    aix
-#   EUC-CN                    aix hpux solaris
-#   EUC-JP                    aix hpux solaris                          yes
-#   EUC-KR                    aix hpux solaris                          yes
-#   EUC-TW                    aix hpux solaris
+#   EUC-CN                    aix hpux irix solaris
+#   EUC-JP                    aix hpux irix solaris                     yes
+#   EUC-KR                    aix hpux irix solaris                     yes
+#   EUC-TW                    aix hpux irix solaris
 #   BIG5                      aix hpux solaris                          yes
 #   GBK                       aix
 #   SJIS                      hpux solaris
@@ -72,6 +74,9 @@
 # Note: Names which are not marked as being a MIME name should not be used in
 # Internet protocols for information interchange (mail, news, etc.).
 #
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # or
@@ -82,13 +87,16 @@ os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
 echo "# This file contains a table of character encoding aliases,"
 echo "# suitable for operating system '${os}'."
 echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
 case "$os" in
     linux* | *-gnu*)
-	# With glibc we don't need any canonicalization, because glibc
-	# supports all GNU canonical names directly.
-	echo "ANSI_X3.4-1968 ASCII" # this is a nop
-	echo "ISO_646.IRV:1983 ASCII" # this is a nop
-	echo "BALTIC ISO-8859-13" # in glibc-2.2 or newer, this is a nop
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
 	;;
     aix*)
 	echo "ISO8859-1 ISO-8859-1"
@@ -126,6 +134,7 @@ case "$os" in
 	echo "iso88597 ISO-8859-7"
 	echo "iso88598 ISO-8859-8"
 	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
 	echo "roman8 HP-ROMAN8"
 	echo "arabic8 HP-ARABIC8"
 	echo "greek8 HP-GREEK8"
@@ -148,6 +157,10 @@ case "$os" in
 	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
 	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN EUC-CN"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
 	;;
     osf*)
 	echo "ISO8859-1 ISO-8859-1"
@@ -177,4 +190,27 @@ case "$os" in
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
 	;;
+    freebsd*)
+	# FreeBSD 3.3 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in lt_LN; do
+	  echo "$l.ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+                 fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT lt_LN \
+                 nl_BE nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l.ISO_8859-1 ISO-8859-1"
+	  echo "$l.DIS_8859-15 ISO-8859-15"
+	done
+	for l in hr_HR hu_HU lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.CP866 CP866"
+	done
+	;;
 esac