added simplified Unicode support for non-locale-enabled builds

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 22 insertions, 12 deletions

diff --git a/Config.in b/Config.in
index ee706eb0d..99f814e5a 100644
--- a/Config.in
+++ b/Config.in
@@ -30,18 +30,6 @@ config EXTRA_COMPAT
           some GNU extensions in libc. You probably only need this option
           if you plan to run busybox on desktop.
 
-config FEATURE_ASSUME_UNICODE
-        bool "Assume that 1:1 char/glyph correspondence is not true"
-        default n
-        help
-          This makes various applets aware that one byte is not
-          one character on screen.
-
-          Busybox aims to eventually work correctly with Unicode displays.
-          Any older encodings are not guaranteed to work.
-          Probably by the time when busybox will be fully Unicode-clean,
-          other encodings will be mainly of historic interest.
-
 choice
         prompt "Buffer allocation policy"
         default FEATURE_BUFFERS_USE_MALLOC
@@ -114,6 +102,28 @@ config LOCALE_SUPPORT
           Enable this if your system has locale support and you would like
           busybox to support locale settings.
 
+config FEATURE_ASSUME_UNICODE
+        bool "Support Unicode"
+        default n
+        help
+          This makes various applets aware that one byte is not
+          one character on screen.
+
+          Busybox aims to eventually work correctly with Unicode displays.
+          Any older encodings are not guaranteed to work.
+          Probably by the time when busybox will be fully Unicode-clean,
+          other encodings will be mainly of historic interest.
+
+config FEATURE_CHECK_UNICODE_IN_ENV
+        bool "Check $LANG environment variable"
+        default y
+        depends on FEATURE_ASSUME_UNICODE && !LOCALE_SUPPORT
+        help
+          With this option on, Unicode support is activated
+          only if LANG variable has the value of the form "xxxx.utf8"
+
+          Otherwise, Unicode support will be always enabled and active.
+
 config LONG_OPTS
         bool "Support for --long-options"
         default y