14 files changed, 66 insertions, 94 deletions
diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha
index 614384df6..f8cc9ddbc 100644
--- a/extra/Configs/Config.alpha
+++ b/extra/Configs/Config.alpha
@@ -77,14 +77,12 @@ HAS_LONG_LONG = true
 HAS_SHADOW = true
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the {w}ctype functions, but that should
-# change shortly.  You must also generate the locale data and associated .h
-# file.  See the README in directory extra/locale for details.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
 # Set this to `false' if you don't have/need wide char support.
-# Note: Currently requires locale support to be enabled above, and
-# is automagically disabled when HAVE_LOCALE is false.
 HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 528d9c8b9..4d552624f 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -81,15 +81,13 @@ HAS_LONG_LONG = false
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index 9c474dc5a..a86931f0b 100644
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300
index 9d27b7e9c..8f29b8bd8 100644
--- a/extra/Configs/Config.h8300
+++ b/extra/Configs/Config.h8300
@@ -80,15 +80,13 @@ DO_C99_MATH = false
 HAS_LONG_LONG = true
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index c2e3d3607..706a34223 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -77,14 +77,12 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the {w}ctype functions, but that should
-# change shortly.  You must also generate the locale data and associated .h
-# file.  See the README in directory extra/locale for details.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
 # Set this to `false' if you don't have/need wide char support.
-# Note: Currently requires locale support to be enabled above, and
-# is automagically disabled when HAVE_LOCALE is false.
 HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960
index 2004bfef3..65d563b7f 100644
--- a/extra/Configs/Config.i960
+++ b/extra/Configs/Config.i960
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index ea85f38a2..90e1d4783 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index 4a340943c..0ca204a7c 100644
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 54163c6f6..5b7eb2032 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -79,15 +79,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index 4e52fa07a..a90e7f0c2 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -79,15 +79,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index c93590ed9..4cd446979 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 0bf18d9fa..399d6bcc5 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -101,15 +101,13 @@ HAS_LONG_LONG = false
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc
index 00dc30ff5..761262365 100644
--- a/extra/Configs/Config.sparc
+++ b/extra/Configs/Config.sparc
@@ -77,15 +77,13 @@ HAS_LONG_LONG = true
 HAS_SHADOW = false
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb 
diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index 39b5f8f7e..b76837fcf 100644
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -79,15 +79,13 @@ DO_C99_MATH = false
 HAS_LONG_LONG = true
 
 # Set this to `false' if you don't have/need locale support; `true' otherwise.
-# Note: Currently only affects the ctype functions.  You must also generate
-# a locale file for anything but the C locale.  See directory extra/locale for
-# a utility to do so.  Also see the following option.
+# NOTE: Currently does not affect collation.
+# You must also generate the locale data and associated .h file.
+# See the README in directory extra/locale for details.
 HAS_LOCALE = false
 
-# Set this to the path of your uClibc locale file directory.
-# Warning!  This must be different than the glibc locale directory to avoid
-# name conflicts, as the locale files are entirely different in format!
-LOCALE_DIR = "/usr/share/uClibc-locale/"
+# Set this to `false' if you don't have/need wide char support.
+HAS_WCHAR = false
 
 # This specifies which malloc implementation is used.
 # "malloc-simple" is very, very small, but is also very, very dumb