X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Config.in;h=05bc3a58abdabe44510e8b93edf99663cf713ef4;hb=c297ea97e288da16216d5c121ddefa7b61923847;hp=fff6d83d58efcf58c692de9a26997d1bb7a32447;hpb=f6107c7e885da0f952569252798b7fc6b4d46411;p=oweals%2Fbusybox.git

diff --git a/Config.in b/Config.in
index fff6d83d5..05bc3a58a 100644
--- a/Config.in
+++ b/Config.in
@@ -30,17 +30,13 @@ 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"
+config USE_PORTABLE_CODE
+	bool "Avoid using GCC-specific code constructs"
 	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.
+	  Use this option if you are trying to compile busybox with
+	  compiler other than gcc.
+	  If you do use gcc, this option may needlessly increase code size.
 
 choice
 	prompt "Buffer allocation policy"
@@ -114,7 +110,29 @@ config LOCALE_SUPPORT
 	  Enable this if your system has locale support and you would like
 	  busybox to support locale settings.
 
-config GETOPT_LONG
+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
 	help