Toolchain: eglibc: Completely rework the way eglibc options are computed

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

13 files changed, 397 insertions, 368 deletions

diff --git a/kconfig/option-groups.def-2.10 b/kconfig/eglibc-2.10.kconfig
index bba4ca9..f97511d 100644
--- a/kconfig/option-groups.def-2.10
+++ b/kconfig/eglibc-2.10.kconfig
@@ -19,7 +19,7 @@
 # An option may have a 'depends' line, indicating which other options
 # must also be enabled if this option is.  At present, EGLIBC doesn't
 # check that these dependencies are satisfied.
-# 
+#
 # Option group variables get their default values from the file
 # 'option-groups.defaults', in the top directory of the EGLIBC source
 # tree.  By default, all EGLIBC option groups are enabled --- their
@@ -37,12 +37,12 @@
 # explicitly enable an option group, you may also write:
 #
 #    OPTION_GROUP_NAME = y
-# 
+#
 # although this simply reestablishes the value already set by
 # 'option-groups.defaults'.
 
 
-config OPTION_EGLIBC_BACKTRACE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BACKTRACE
 	default y
 	bool "Functions for producing backtraces"
 	help
@@ -57,7 +57,7 @@ config OPTION_EGLIBC_BACKTRACE
 		backtrace_symbols
 		backtrace_symbols_fd
 
-config OPTION_EGLIBC_BSD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BSD
 	bool "BSD-specific functions, and their compatibility stubs"
 	help
 		This option group includes functions specific to BSD kernels.
@@ -73,9 +73,10 @@ config OPTION_EGLIBC_BSD
 		 revoke
 		 setlogin
 
-config OPTION_EGLIBC_CXX_TESTS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CXX_TESTS
 	bool "Tests that link against the standard C++ library."
-	depends on OPTION_POSIX_WIDE_CHAR_DEVICE_IO && OPTION_EGLIBC_LIBM
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	help
 		This option group does not include any C library functions;
 		instead, it controls which EGLIBC tests an ordinary 'make
@@ -87,7 +88,7 @@ config OPTION_EGLIBC_CXX_TESTS
 		the wide character I/O functions included in EGLIBC.  If those
 		option groups are disabled, this test must also be disabled.
 
-config OPTION_EGLIBC_LIBM
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	default y
 	bool "libm (math library)"
 	help
@@ -106,7 +107,7 @@ config OPTION_EGLIBC_LIBM
 		group, you will not be able to build 'libstdc++' against the
 		resulting EGLIBC installation.
 
-config OPTION_EGLIBC_CHARSETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS
 	bool "iconv/gconv character set conversion libraries"
 	help
 		This option group includes support for character sets other
@@ -168,7 +169,7 @@ config OPTION_EGLIBC_CHARSETS
 
 		WCHAR_T           - EGLIBC's internal form (target-endian,32-bit ISO 10646)
 
-config OPTION_EGLIBC_DB_ALIASES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_DB_ALIASES
 	bool "Functions for accessing the mail aliases database"
 	help
 		This option group includues functions for looking up mail
@@ -185,7 +186,7 @@ config OPTION_EGLIBC_DB_ALIASES
 		When this option group is disabled, the NSS service libraries
 		also lack support for querying their mail alias tables.
 
-config OPTION_EGLIBC_ENVZ
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ENVZ
 	bool "Functions for handling envz-style environment vectors."
 	help
 		This option group contains functions for creating and operating
@@ -196,11 +197,11 @@ config OPTION_EGLIBC_ENVZ
 
 		This option group includes the following functions:
 
-		envz_add        envz_merge 
+		envz_add        envz_merge
 		envz_entry      envz_remove
-		envz_get        envz_strip 
+		envz_get        envz_strip
 
-config OPTION_EGLIBC_FCVT
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FCVT
 	bool "Functions for converting floating-point numbers to strings"
 	help
 		This option group includes functions for converting
@@ -214,14 +215,14 @@ config OPTION_EGLIBC_FCVT
 		fcvt_r		qfcvt_r
 		gcvt		qgcvt
 
-config OPTION_EGLIBC_FMTMSG
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FMTMSG
 	bool "Functions for formatting messages"
 	default y
 	help
 		This option group includes the following functions:
 		addseverity    fmtmsg
 
-config OPTION_EGLIBC_FSTAB
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FSTAB
 	default y
 	bool "Access functions for 'fstab'"
 	help
@@ -236,7 +237,7 @@ config OPTION_EGLIBC_FSTAB
 		getfsent       setfsent
 		getfsfile
 
-config OPTION_EGLIBC_FTRAVERSE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FTRAVERSE
 	default y
 	bool "Functions for traversing file hierarchies"
 	help
@@ -251,7 +252,7 @@ config OPTION_EGLIBC_FTRAVERSE
 		fts_set	nftw64
 		fts_close
 
-config OPTION_EGLIBC_INET
+config KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	default y
 	bool "Networking support"
 	help
@@ -377,9 +378,9 @@ config OPTION_EGLIBC_INET
 		use Unix-domain sockets to communicate with the syslog daemon;
 		syslog is valuable in non-networked contexts.
 
-config OPTION_EGLIBC_ADVANCED_INET6
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6
 	bool "IPv6 Advanced Sockets API support (RFC3542)"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes the functions specified by RFC 3542,
 		"Advanced Sockets Application Program Interface (API) for
@@ -407,17 +408,17 @@ config OPTION_EGLIBC_ADVANCED_INET6
 		inet6_rth_segments
 		inet6_rth_space
 
-config OPTION_EGLIBC_SUNRPC
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SUNRPC
 	bool "Support for the Sun 'RPC' protocol."
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	default y
 	help
 		This option group includes support for the Sun RPC protocols,
 		including the 'rpcgen' and 'rpcinfo' programs.
 
-config OPTION_EGLIBC_NIS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NIS
 	bool "Support for NIS, NIS+, and the special 'compat' services."
-	depends on OPTION_EGLIBC_SUNRPC
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes the NIS, NIS+, and 'compat' Name
 		Service Switch service libraries.  When it is disabled, those
@@ -427,9 +428,9 @@ config OPTION_EGLIBC_NIS
 		This option group depends on the OPTION_EGLIBC_INET option
 		group; you must enable that to enable this option group.
 
-config OPTION_EGLIBC_RCMD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_RCMD
 	bool "Support for 'rcmd' and related library functions"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes functions for running commands on
 		remote machines via the 'rsh' protocol, and doing authentication
@@ -445,14 +446,14 @@ config OPTION_EGLIBC_RCMD
 		rresvport       ruserpass
 		rresvport_af
 
-config OPTION_EGLIBC_LOCALES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALES
 	bool "Locale definitions"
 	help
 		This option group includes all locale definitions other than
 		that for the "C" locale.  If this option group is omitted, then
 		only the "C" locale is supported.
 
-config OPTION_EGLIBC_NSSWITCH
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
 	default y
 	bool "Name service switch (nsswitch) support"
 	help
@@ -469,9 +470,9 @@ config OPTION_EGLIBC_NSSWITCH
 		'option-groups.config' file must set the following two
 		variables:
 
-config OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
-	depends on OPTION_EGLIBC_NSSWITCH
-	string "Alternate file for nsswitch.conf"
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	string "Alternate file for nsswitch.conf (see below help please)"
 	help
 		Set this to the name of a file whose contents observe the
 		same syntax as an ordinary '/etc/nsswitch.conf' file.  The
@@ -494,9 +495,9 @@ config OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
 		you will probably want to delete references to databases not
 		needed on your system.
 
-config OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
-	depends on OPTION_EGLIBC_NSSWITCH
-	string "Alternate nss/fixed-nsswitch.functions file"
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	string "Alternate nss/fixed-nsswitch.functions file (see below help please)"
 	help
 		The EGLIBC build process uses this file to decide which
 		functions to make available from which service libraries.
@@ -532,8 +533,8 @@ config OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
 		option group must be enabled to use the 'libnss_dns.so.2'
 		service library, which uses the Domain Name System network
 		protocol to answer queries.
-        
-config OPTION_EGLIBC_SPAWN
+
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SPAWN
 	bool "Support for POSIX posix_spawn functions"
 	help
 		This option group includes the POSIX functions for executing
@@ -569,7 +570,7 @@ config OPTION_EGLIBC_SPAWN
 		disabled, those programs will only operate on uncompressed
 		charmap files.
 
-config OPTION_EGLIBC_STREAMS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS
 	bool "Support for accessing STREAMS."
 		help
 		This option group includes functions for reading and writing
@@ -585,7 +586,7 @@ config OPTION_EGLIBC_STREAMS
 		isastream       fdetach
 		putmsg
 
-config OPTION_EGLIBC_UTMP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	bool "Older access functions for 'utmp' login records"
 	default y
 	help
@@ -612,10 +613,10 @@ config OPTION_EGLIBC_UTMP
 		This option group includes the following libraries:
 
 		libutil.so (and libutil.a)
- 
-config OPTION_EGLIBC_GETLOGIN
+
+config KEMBTK_EGLIBC_OPTION_EGLIBC_GETLOGIN
 	bool "The getlogin function"
-	depends on OPTION_EGLIBC_UTMP
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	default y
 	help
 		This function group includes the 'getlogin' and 'getlogin_r'
@@ -626,9 +627,9 @@ config OPTION_EGLIBC_GETLOGIN
 		fall back on 'getlogin' to find the user's login name for tilde
 		expansion when the 'HOME' environment variable is not set.
 
-config OPTION_EGLIBC_UTMPX
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMPX
 	bool "POSIX access functions for 'utmp' login records"
-	depends on OPTION_EGLIBC_UTMP    
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	help
 		This option group includes the POSIX functions for reading and
 		writing user login records in the 'utmp' file (usually
@@ -649,7 +650,7 @@ config OPTION_EGLIBC_UTMPX
 		updwtmpx
 		utmpxname
 
-config OPTION_EGLIBC_WORDEXP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_WORDEXP
 	default y
 	bool "Shell-style word expansion"
 	help
@@ -657,7 +658,7 @@ config OPTION_EGLIBC_WORDEXP
 		performing word expansion in the manner of the shell, and the
 		accompanying 'wordfree' function.
 
-config OPTION_POSIX_C_LANG_WIDE_CHAR
+config KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	bool "ISO C library wide character functions, excluding I/O"
 	help
 		This option group includes the functions defined by the ISO C
@@ -686,9 +687,9 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
 		mbrlen        wcscoll       wcstol
 		mbrtowc       wcscpy        wcstold
 
-config OPTION_EGLIBC_LOCALE_CODE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	bool "Locale functions"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes locale support functions, programs,
 		and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
@@ -709,9 +710,9 @@ config OPTION_EGLIBC_LOCALE_CODE
 		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
 		disable OPTION_EGLIBC_CATGETS.
 
-config OPTION_EGLIBC_CATGETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CATGETS
 	bool "Functions for accessing message catalogs"
-	depends on OPTION_EGLIBC_LOCALE_CODE
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	help
 		This option group includes functions for accessing message
 		catalogs: catopen, catclose, and catgets.
@@ -719,9 +720,9 @@ config OPTION_EGLIBC_CATGETS
 		This option group depends on the OPTION_EGLIBC_LOCALE_CODE
 		option group; if you disable that, you must also disable this.
 
-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+config KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 	bool "Input and output functions for wide characters"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes functions for reading and writing
 		wide characters to and from <stdio.h> streams.
@@ -741,7 +742,7 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		fgetws_unlocked           getwchar_unlocked
 		fputwc_unlocked           putwc_unlocked
 		fputws_unlocked           putwchar_unlocked
-		    
+
 		Note that the GNU standard C++ library, 'libstdc++.so', uses
 		some of these functions; you will not be able to link or run
 		C++ programs if you disable this option group.
@@ -765,7 +766,7 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		option group disabled, the function returns NULL, and sets
 		errno to EINVAL.
 
-config OPTION_POSIX_REGEXP
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	default y
 	bool "Regular expressions"
 	help
@@ -787,9 +788,9 @@ config OPTION_POSIX_REGEXP
 		<regexp.h> header file, 'compile', 'step', and 'advance', is
 		omitted.
 
-config OPTION_POSIX_REGEXP_GLIBC
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP_GLIBC
 	bool "Regular expressions from GLIBC"
-	depends on OPTION_POSIX_REGEXP
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	help
 		This option group specifies which regular expression
 		library to use.  The choice is between regex
diff --git a/kconfig/option-groups.def-2.11 b/kconfig/eglibc-2.11.kconfig
index 9a7810c..a87bc55 100644
--- a/kconfig/option-groups.def-2.11
+++ b/kconfig/eglibc-2.11.kconfig
@@ -19,7 +19,7 @@
 # An option may have a 'depends' line, indicating which other options
 # must also be enabled if this option is.  At present, EGLIBC doesn't
 # check that these dependencies are satisfied.
-# 
+#
 # Option group variables get their default values from the file
 # 'option-groups.defaults', in the top directory of the EGLIBC source
 # tree.  By default, all EGLIBC option groups are enabled --- their
@@ -37,11 +37,11 @@
 # explicitly enable an option group, you may also write:
 #
 #    OPTION_GROUP_NAME = y
-# 
+#
 # although this simply reestablishes the value already set by
 # 'option-groups.defaults'.
 
-config OPTION_EGLIBC_BACKTRACE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BACKTRACE
 	bool "Functions for producing backtraces"
 	help
 		This option group includes functions for producing a list of
@@ -55,7 +55,7 @@ config OPTION_EGLIBC_BACKTRACE
 		backtrace_symbols
 		backtrace_symbols_fd
 
-config OPTION_EGLIBC_BIG_MACROS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BIG_MACROS
 	bool "Use extensive inline code"
 	help
 		This option group specifies whether certain pieces of code
@@ -63,7 +63,7 @@ config OPTION_EGLIBC_BIG_MACROS
 		group is not selected, function calls will be used instead,
 		hence reducing the library footprint.
 
-config OPTION_EGLIBC_BSD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BSD
 	bool "BSD-specific functions, and their compatibility stubs"
 	help
 		This option group includes functions specific to BSD kernels.
@@ -79,10 +79,10 @@ config OPTION_EGLIBC_BSD
 		revoke
 		setlogin
 
-config OPTION_EGLIBC_CXX_TESTS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CXX_TESTS
 	bool "Tests that link against the standard C++ library."
-	depends on OPTION_POSIX_WIDE_CHAR_DEVICE_IO
-	depends on OPTION_EGLIBC_LIBM
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	help
 		This option group does not include any C library functions;
 		instead, it controls which EGLIBC tests an ordinary 'make
@@ -94,7 +94,7 @@ config OPTION_EGLIBC_CXX_TESTS
 		the wide character I/O functions included in EGLIBC.  If those
 		option groups are disabled, this test must also be disabled.
 
-config OPTION_EGLIBC_CHARSETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS
 	bool "iconv/gconv character set conversion libraries"
 	help
 		This option group includes support for character sets other
@@ -157,7 +157,7 @@ config OPTION_EGLIBC_CHARSETS
 		WCHAR_T           - EGLIBC's internal form (target-endian,
 			      32-bit ISO 10646)
 
-config OPTION_EGLIBC_DB_ALIASES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_DB_ALIASES
 	bool "Functions for accessing the mail aliases database"
 	help
 		This option group includues functions for looking up mail
@@ -174,7 +174,7 @@ config OPTION_EGLIBC_DB_ALIASES
 		When this option group is disabled, the NSS service libraries
 		also lack support for querying their mail alias tables.
 
-config OPTION_EGLIBC_ENVZ
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ENVZ
 	bool "Functions for handling envz-style environment vectors."
 	help
 		This option group contains functions for creating and operating
@@ -185,11 +185,11 @@ config OPTION_EGLIBC_ENVZ
 
 		This option group includes the following functions:
 
-		envz_add        envz_merge 
+		envz_add        envz_merge
 		envz_entry      envz_remove
-		envz_get        envz_strip 
+		envz_get        envz_strip
 
-config OPTION_EGLIBC_FCVT
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FCVT
 	bool "Functions for converting floating-point numbers to strings"
 	help
 		This option group includes functions for converting
@@ -203,7 +203,7 @@ config OPTION_EGLIBC_FCVT
 		fcvt_r		qfcvt_r
 		gcvt		qgcvt
 
-config OPTION_EGLIBC_FMTMSG
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FMTMSG
 	bool "Functions for formatting messages"
 	default y
 	help
@@ -211,7 +211,7 @@ config OPTION_EGLIBC_FMTMSG
 
 		addseverity    fmtmsg
 
-config OPTION_EGLIBC_FSTAB
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FSTAB
 	bool "Access functions for 'fstab'"
 	default y
 	help
@@ -226,7 +226,7 @@ config OPTION_EGLIBC_FSTAB
 		getfsent       setfsent
 		getfsfile
 
-config OPTION_EGLIBC_FTRAVERSE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FTRAVERSE
 	bool "Functions for traversing file hierarchies"
 	default y
 	help
@@ -241,7 +241,7 @@ config OPTION_EGLIBC_FTRAVERSE
 		fts_set	nftw64
 		fts_close
 
-config OPTION_EGLIBC_INET
+config KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	bool "Networking support"
 	default y
 	help
@@ -367,18 +367,17 @@ config OPTION_EGLIBC_INET
 		use Unix-domain sockets to communicate with the syslog daemon;
 		syslog is valuable in non-networked contexts.
 
-config OPTION_EGLIBC_SUNRPC
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SUNRPC
 	bool "Support for the Sun 'RPC' protocol."
-		depends on OPTION_EGLIBC_INET
+		depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 		default y
 		help
 		This option group includes support for the Sun RPC protocols,
 		including the 'rpcgen' and 'rpcinfo' programs.
 
-config OPTION_EGLIBC_NIS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NIS
 	bool "Support for NIS, NIS+, and the special 'compat' services."
-		depends on OPTION_EGLIBC_INET
-		depends on OPTION_EGLIBC_SUNRPC
+		depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 		help
 		This option group includes the NIS, NIS+, and 'compat' Name
 		Service Switch service libraries.  When it is disabled, those
@@ -388,9 +387,9 @@ config OPTION_EGLIBC_NIS
 		This option group depends on the OPTION_EGLIBC_INET option
 		group; you must enable that to enable this option group.
 
-config OPTION_EGLIBC_ADVANCED_INET6
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6
 	bool "IPv6 Advanced Sockets API support (RFC3542)"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes the functions specified by RFC 3542,
 		"Advanced Sockets Application Program Interface (API) for
@@ -418,9 +417,9 @@ config OPTION_EGLIBC_ADVANCED_INET6
 		inet6_rth_segments
 		inet6_rth_space
 
-config OPTION_EGLIBC_RCMD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_RCMD
 	bool "Support for 'rcmd' and related library functions"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes functions for running commands on
 		remote machines via the 'rsh' protocol, and doing authentication
@@ -436,7 +435,7 @@ config OPTION_EGLIBC_RCMD
 		rresvport       ruserpass
 		rresvport_af
 
-config OPTION_EGLIBC_LIBM
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	bool "libm (math library)"
 	default y
 	help
@@ -455,14 +454,14 @@ config OPTION_EGLIBC_LIBM
 		group, you will not be able to build 'libstdc++' against the
 		resulting EGLIBC installation.
 
-config OPTION_EGLIBC_LOCALES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALES
 	bool "Locale definitions"
 	help
 		This option group includes all locale definitions other than
 		that for the "C" locale.  If this option group is omitted, then
 		only the "C" locale is supported.
 
-config OPTION_EGLIBC_MEMUSAGE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE
 	bool "Memory profiling library"
 	default y
 	help
@@ -470,8 +469,11 @@ config OPTION_EGLIBC_MEMUSAGE
 		the `memusage' and `memusagestat' utilities.
 		These components provide memory profiling functions.
 
-		config OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
-
+config KEMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+	int "Libmemusage library buffers size"
+	default 512
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE
+	help
 		Libmemusage library buffers the profiling data in memory
 		before writing it out to disk.  By default, the library
 		allocates 1.5M buffer, which can be substantial for some
@@ -482,7 +484,7 @@ config OPTION_EGLIBC_MEMUSAGE
 		so setting this option to the value of 512 will reduce the size
 		of the memory buffer to 24K.
 
-config OPTION_EGLIBC_NSSWITCH
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
 	bool "Name service switch (nsswitch) support"
 	default y
 	help
@@ -499,8 +501,10 @@ config OPTION_EGLIBC_NSSWITCH
 		'option-groups.config' file must set the following two
 		variables:
 
-		OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
-
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+	string "Alternate file for nsswitch.conf (see below help please)"
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	help
 		Set this to the name of a file whose contents observe the
 		same syntax as an ordinary '/etc/nsswitch.conf' file.  The
 		EGLIBC build process parses this file just as EGLIBC would
@@ -522,8 +526,10 @@ config OPTION_EGLIBC_NSSWITCH
 		you will probably want to delete references to databases not
 		needed on your system.
 
-		OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
-
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+	string "Alternate nss/fixed-nsswitch.functions file (see below help please)"
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	help
 		The EGLIBC build process uses this file to decide which
 		functions to make available from which service libraries.
 		The file 'nss/fixed-nsswitch.functions' serves as a sample
@@ -558,8 +564,8 @@ config OPTION_EGLIBC_NSSWITCH
 		option group must be enabled to use the 'libnss_dns.so.2'
 		service library, which uses the Domain Name System network
 		protocol to answer queries.
-        
-config OPTION_EGLIBC_SPAWN
+
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SPAWN
 	bool "Support for POSIX posix_spawn functions"
 	help
 		This option group includes the POSIX functions for executing
@@ -595,7 +601,7 @@ config OPTION_EGLIBC_SPAWN
 		disabled, those programs will only operate on uncompressed
 		charmap files.
 
-config OPTION_EGLIBC_STREAMS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS
 	bool "Support for accessing STREAMS."
 	help
 		This option group includes functions for reading and writing
@@ -611,7 +617,7 @@ config OPTION_EGLIBC_STREAMS
 		isastream       fdetach
 		putmsg
 
-config OPTION_EGLIBC_UTMP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	bool "Older access functions for 'utmp' login records"
 	default y
 	help
@@ -639,9 +645,9 @@ config OPTION_EGLIBC_UTMP
 
 		libutil.so (and libutil.a)
 
-config OPTION_EGLIBC_GETLOGIN
+config KEMBTK_EGLIBC_OPTION_EGLIBC_GETLOGIN
 	bool "The getlogin function"
-	depends on OPTION_EGLIBC_UTMP
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	default y
 	help
 		This function group includes the 'getlogin' and 'getlogin_r'
@@ -652,9 +658,9 @@ config OPTION_EGLIBC_GETLOGIN
 		fall back on 'getlogin' to find the user's login name for tilde
 		expansion when the 'HOME' environment variable is not set.
 
-config OPTION_EGLIBC_UTMPX
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMPX
 	bool "POSIX access functions for 'utmp' login records"
-	depends on OPTION_EGLIBC_UTMP    
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	help
 		This option group includes the POSIX functions for reading and
 		writing user login records in the 'utmp' file (usually
@@ -675,7 +681,7 @@ config OPTION_EGLIBC_UTMPX
 		updwtmpx
 		utmpxname
 
-config OPTION_EGLIBC_WORDEXP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_WORDEXP
 	bool "Shell-style word expansion"
 	default y
 	help
@@ -683,7 +689,7 @@ config OPTION_EGLIBC_WORDEXP
 		performing word expansion in the manner of the shell, and the
 		accompanying 'wordfree' function.
 
-config OPTION_POSIX_C_LANG_WIDE_CHAR
+config KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	bool "ISO C library wide character functions, excluding I/O"
 	help
 		This option group includes the functions defined by the ISO C
@@ -712,9 +718,9 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
 		mbrlen        wcscoll       wcstol
 		mbrtowc       wcscpy        wcstold
 
-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+config KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 	bool "Input and output functions for wide characters"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes functions for reading and writing
 		wide characters to and from <stdio.h> streams.
@@ -734,7 +740,7 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		fgetws_unlocked           getwchar_unlocked
 		fputwc_unlocked           putwc_unlocked
 		fputws_unlocked           putwchar_unlocked
-		    
+
 		Note that the GNU standard C++ library, 'libstdc++.so', uses
 		some of these functions; you will not be able to link or run
 		C++ programs if you disable this option group.
@@ -758,9 +764,9 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		option group disabled, the function returns NULL, and sets
 		errno to EINVAL.
 
-config OPTION_EGLIBC_LOCALE_CODE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	bool "Locale functions"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes locale support functions, programs,
 		and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
@@ -781,9 +787,9 @@ config OPTION_EGLIBC_LOCALE_CODE
 		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
 		disable OPTION_EGLIBC_CATGETS.
 
-config OPTION_EGLIBC_CATGETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CATGETS
 	bool "Functions for accessing message catalogs"
-	depends on OPTION_EGLIBC_LOCALE_CODE
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	help
 		This option group includes functions for accessing message
 		catalogs: catopen, catclose, and catgets.
@@ -791,7 +797,7 @@ config OPTION_EGLIBC_CATGETS
 		This option group depends on the OPTION_EGLIBC_LOCALE_CODE
 		option group; if you disable that, you must also disable this.
 
-config OPTION_POSIX_REGEXP
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	bool "Regular expressions"
 	default y
 	help
@@ -813,9 +819,9 @@ config OPTION_POSIX_REGEXP
 		<regexp.h> header file, 'compile', 'step', and 'advance', is
 		omitted.
 
-config OPTION_POSIX_REGEXP_GLIBC
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP_GLIBC
 	bool "Regular expressions from GLIBC"
-	depends on OPTION_POSIX_REGEXP
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	help
 		This option group specifies which regular expression
 		library to use.  The choice is between regex
diff --git a/kconfig/option-groups.def-2.9 b/kconfig/eglibc-2.9.kconfig
index f0e4bdf..8b2b0ff 100644
--- a/kconfig/option-groups.def-2.9
+++ b/kconfig/eglibc-2.9.kconfig
@@ -19,7 +19,7 @@
 # An option may have a 'depends' line, indicating which other options
 # must also be enabled if this option is.  At present, EGLIBC doesn't
 # check that these dependencies are satisfied.
-# 
+#
 # Option group variables get their default values from the file
 # 'option-groups.defaults', in the top directory of the EGLIBC source
 # tree.  By default, all EGLIBC option groups are enabled --- their
@@ -37,11 +37,11 @@
 # explicitly enable an option group, you may also write:
 #
 #    OPTION_GROUP_NAME = y
-# 
+#
 # although this simply reestablishes the value already set by
 # 'option-groups.defaults'.
 
-config OPTION_EGLIBC_BACKTRACE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BACKTRACE
    default y
    bool "Functions for producing backtraces"
    help
@@ -56,7 +56,7 @@ config OPTION_EGLIBC_BACKTRACE
          backtrace_symbols
          backtrace_symbols_fd
 
-config OPTION_EGLIBC_BSD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BSD
    bool "BSD-specific functions, and their compatibility stubs"
    help
        This option group includes functions specific to BSD kernels.
@@ -72,9 +72,10 @@ config OPTION_EGLIBC_BSD
          revoke
          setlogin
 
-config OPTION_EGLIBC_CXX_TESTS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CXX_TESTS
    bool "Tests that link against the standard C++ library."
-   depends on OPTION_POSIX_WIDE_CHAR_DEVICE_IO && OPTION_EGLIBC_LIBM
+   depends on KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
    help
        This option group does not include any C library functions;
        instead, it controls which EGLIBC tests an ordinary 'make
@@ -86,7 +87,7 @@ config OPTION_EGLIBC_CXX_TESTS
        the wide character I/O functions included in EGLIBC.  If those
        option groups are disabled, this test must also be disabled.
 
-config OPTION_EGLIBC_CHARSETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS
    bool "iconv/gconv character set conversion libraries"
    help
 
@@ -150,7 +151,7 @@ config OPTION_EGLIBC_CHARSETS
           WCHAR_T           - EGLIBC's internal form (target-endian,
                               32-bit ISO 10646)
 
-config OPTION_EGLIBC_DB_ALIASES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_DB_ALIASES
    bool "Functions for accessing the mail aliases database"
    help
        This option group includues functions for looking up mail
@@ -167,7 +168,7 @@ config OPTION_EGLIBC_DB_ALIASES
        When this option group is disabled, the NSS service libraries
        also lack support for querying their mail alias tables.
 
-config OPTION_EGLIBC_ENVZ
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ENVZ
    bool "Functions for handling envz-style environment vectors."
    help
        This option group contains functions for creating and operating
@@ -178,11 +179,11 @@ config OPTION_EGLIBC_ENVZ
 
        This option group includes the following functions:
 
-        envz_add        envz_merge 
+        envz_add        envz_merge
         envz_entry      envz_remove
-        envz_get        envz_strip 
+        envz_get        envz_strip
 
-config OPTION_EGLIBC_FSTAB
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FSTAB
    default y
    bool "Access functions for 'fstab'"
    help
@@ -197,7 +198,7 @@ config OPTION_EGLIBC_FSTAB
          getfsent       setfsent
          getfsfile
 
-config OPTION_EGLIBC_INET
+config KEMBTK_EGLIBC_OPTION_EGLIBC_INET
    default y
    bool "Networking support"
    help
@@ -215,7 +216,7 @@ config OPTION_EGLIBC_INET
          libnss_nis
          libnss_nisplus
          libresolv
-         
+
        - The following functions and variables are omitted from libc:
 
          authdes_create           hstrerror              svc_fdset
@@ -323,9 +324,9 @@ config OPTION_EGLIBC_INET
        use Unix-domain sockets to communicate with the syslog daemon;
        syslog is valuable in non-networked contexts.
 
-config OPTION_EGLIBC_ADVANCED_INET6
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6
    bool "IPv6 Advanced Sockets API support (RFC3542)"
-   depends on OPTION_EGLIBC_INET
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
    help
        This option group includes the functions specified by RFC 3542,
        "Advanced Sockets Application Program Interface (API) for
@@ -353,9 +354,9 @@ config OPTION_EGLIBC_ADVANCED_INET6
          inet6_rth_segments
          inet6_rth_space
 
-config OPTION_EGLIBC_RCMD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_RCMD
    bool "Support for 'rcmd' and related library functions"
-   depends on OPTION_EGLIBC_INET
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
    help
       This option group includes functions for running commands on
       remote machines via the 'rsh' protocol, and doing authentication
@@ -371,17 +372,17 @@ config OPTION_EGLIBC_RCMD
         rresvport       ruserpass
         rresvport_af
 
-config OPTION_EGLIBC_SUNRPC
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SUNRPC
    bool "Support for the Sun 'RPC' protocol."
-   depends on OPTION_EGLIBC_INET
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
    default y
    help
       This option group includes support for the Sun RPC protocols,
       including the 'rpcgen' and 'rpcinfo' programs.
 
-config OPTION_EGLIBC_NIS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NIS
    bool "Support for NIS, NIS+, and the special 'compat' services."
-   depends on OPTION_EGLIBC_SUNRPC
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
    help
        This option group includes the NIS, NIS+, and 'compat' Name
        Service Switch service libraries.  When it is disabled, those
@@ -391,7 +392,7 @@ config OPTION_EGLIBC_NIS
        This option group depends on the OPTION_EGLIBC_INET option
        group; you must enable that to enable this option group.
 
-config OPTION_EGLIBC_LIBM
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
    default y
    bool "libm (math library)"
    help
@@ -410,7 +411,7 @@ config OPTION_EGLIBC_LIBM
        group, you will not be able to build 'libstdc++' against the
        resulting EGLIBC installation.
 
-config OPTION_EGLIBC_LOCALES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALES
 	bool "Locale definitions"
 	help
 		This option group includes all locale definitions other than
@@ -430,7 +431,7 @@ config OPTION_EGLIBC_LOCALES
 		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
 		disable OPTION_EGLIBC_CATGETS.
 
-config OPTION_EGLIBC_NSSWITCH
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
 	default y
 	bool "Name service switch (nsswitch) support"
 	help
@@ -447,9 +448,9 @@ config OPTION_EGLIBC_NSSWITCH
 		'option-groups.config' file must set the following two
 		variables:
 
-config OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
-	depends on OPTION_EGLIBC_NSSWITCH
-	string "Alternate file for nsswitch.conf"
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	string "Alternate file for nsswitch.conf (see below help please)"
 	help
 		Set this to the name of a file whose contents observe the
 		same syntax as an ordinary '/etc/nsswitch.conf' file.  The
@@ -472,9 +473,9 @@ config OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
 		you will probably want to delete references to databases not
 		needed on your system.
 
-config OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
-	depends on OPTION_EGLIBC_NSSWITCH
-	string "Alternate nss/fixed-nsswitch.functions file"
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	string "Alternate nss/fixed-nsswitch.functions file (see below help please)"
 	help
 		The EGLIBC build process uses this file to decide which
 		functions to make available from which service libraries.
@@ -510,8 +511,8 @@ config OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
 		option group must be enabled to use the 'libnss_dns.so.2'
 		service library, which uses the Domain Name System network
 		protocol to answer queries.
-        
-config OPTION_EGLIBC_SPAWN
+
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SPAWN
    bool "Support for POSIX posix_spawn functions"
    help
       This option group includes the POSIX functions for executing
@@ -547,7 +548,7 @@ config OPTION_EGLIBC_SPAWN
       disabled, those programs will only operate on uncompressed
       charmap files.
 
-config OPTION_EGLIBC_STREAMS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS
    bool "Support for accessing STREAMS."
    help
       This option group includes functions for reading and writing
@@ -563,7 +564,7 @@ config OPTION_EGLIBC_STREAMS
         isastream       fdetach
         putmsg
 
-config OPTION_EGLIBC_UTMP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	bool "Older access functions for 'utmp' login records"
 		help
 		This option group includes the older 'utent' family of
@@ -590,9 +591,9 @@ config OPTION_EGLIBC_UTMP
 
 		libutil.so (and libutil.a)
 
-config OPTION_EGLIBC_GETLOGIN
+config KEMBTK_EGLIBC_OPTION_EGLIBC_GETLOGIN
    bool "The getlogin function"
-   depends on OPTION_EGLIBC_UTMP
+   depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
    help
        This function group includes the 'getlogin' and 'getlogin_r'
        functions, which return the user name associated by the login
@@ -602,9 +603,9 @@ config OPTION_EGLIBC_GETLOGIN
        fall back on 'getlogin' to find the user's login name for tilde
        expansion when the 'HOME' environment variable is not set.
 
-config OPTION_EGLIBC_UTMPX
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMPX
     bool "POSIX access functions for 'utmp' login records"
-    depends on OPTION_EGLIBC_UTMP    
+    depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
     help
        This option group includes the POSIX functions for reading and
        writing user login records in the 'utmp' file (usually
@@ -625,7 +626,7 @@ config OPTION_EGLIBC_UTMPX
          updwtmpx
          utmpxname
 
-config OPTION_EGLIBC_WORDEXP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_WORDEXP
     default y
     bool "Shell-style word expansion"
     help
@@ -633,7 +634,7 @@ config OPTION_EGLIBC_WORDEXP
         performing word expansion in the manner of the shell, and the
         accompanying 'wordfree' function.
 
-config OPTION_POSIX_C_LANG_WIDE_CHAR
+config KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	bool "ISO C library wide character functions, excluding I/O"
 	help
 		This option group includes the functions defined by the ISO C
@@ -662,9 +663,9 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
 		mbrlen        wcscoll       wcstol
 		mbrtowc       wcscpy        wcstold
 
-config OPTION_EGLIBC_LOCALE_CODE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	bool "Locale functions"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes locale support functions, programs,
 		and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
@@ -685,9 +686,9 @@ config OPTION_EGLIBC_LOCALE_CODE
 		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
 		disable OPTION_EGLIBC_CATGETS.
 
-config OPTION_EGLIBC_CATGETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CATGETS
 	bool "Functions for accessing message catalogs"
-	depends on OPTION_EGLIBC_LOCALE_CODE
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	help
 		This option group includes functions for accessing message
 		catalogs: catopen, catclose, and catgets.
@@ -695,9 +696,9 @@ config OPTION_EGLIBC_CATGETS
 		This option group depends on the OPTION_EGLIBC_LOCALE_CODE
 		option group; if you disable that, you must also disable this.
 
-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+config KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 	bool "Input and output functions for wide characters"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes functions for reading and writing
 		wide characters to and from <stdio.h> streams.
@@ -741,7 +742,7 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		option group disabled, the function returns NULL, and sets
 		errno to EINVAL.
 
-config OPTION_POSIX_REGEXP
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
     default y
     bool "Regular expressions"
     help
diff --git a/kconfig/option-groups.def-trunk b/kconfig/eglibc-trunk.kconfig
index 6e2e47c..f2ce369 100644
--- a/kconfig/option-groups.def-trunk
+++ b/kconfig/eglibc-trunk.kconfig
@@ -19,7 +19,7 @@
 # An option may have a 'depends' line, indicating which other options
 # must also be enabled if this option is.  At present, EGLIBC doesn't
 # check that these dependencies are satisfied.
-# 
+#
 # Option group variables get their default values from the file
 # 'option-groups.defaults', in the top directory of the EGLIBC source
 # tree.  By default, all EGLIBC option groups are enabled --- their
@@ -37,11 +37,11 @@
 # explicitly enable an option group, you may also write:
 #
 #    OPTION_GROUP_NAME = y
-# 
+#
 # although this simply reestablishes the value already set by
 # 'option-groups.defaults'.
 
-config OPTION_EGLIBC_BACKTRACE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BACKTRACE
 	bool "Functions for producing backtraces"
 	help
 		This option group includes functions for producing a list of
@@ -55,7 +55,7 @@ config OPTION_EGLIBC_BACKTRACE
 		backtrace_symbols
 		backtrace_symbols_fd
 
-config OPTION_EGLIBC_BIG_MACROS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BIG_MACROS
 	bool "Use extensive inline code"
 	help
 		This option group specifies whether certain pieces of code
@@ -63,7 +63,7 @@ config OPTION_EGLIBC_BIG_MACROS
 		group is not selected, function calls will be used instead,
 		hence reducing the library footprint.
 
-config OPTION_EGLIBC_BSD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_BSD
 	bool "BSD-specific functions, and their compatibility stubs"
 	help
 		This option group includes functions specific to BSD kernels.
@@ -79,10 +79,10 @@ config OPTION_EGLIBC_BSD
 		revoke
 		setlogin
 
-config OPTION_EGLIBC_CXX_TESTS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CXX_TESTS
 	bool "Tests that link against the standard C++ library."
-	depends on OPTION_POSIX_WIDE_CHAR_DEVICE_IO
-	depends on OPTION_EGLIBC_LIBM
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	help
 		This option group does not include any C library functions;
 		instead, it controls which EGLIBC tests an ordinary 'make
@@ -94,7 +94,7 @@ config OPTION_EGLIBC_CXX_TESTS
 		the wide character I/O functions included in EGLIBC.  If those
 		option groups are disabled, this test must also be disabled.
 
-config OPTION_EGLIBC_CHARSETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS
 	bool "iconv/gconv character set conversion libraries"
 	help
 		This option group includes support for character sets other
@@ -157,7 +157,7 @@ config OPTION_EGLIBC_CHARSETS
 		WCHAR_T           - EGLIBC's internal form (target-endian,
 			      32-bit ISO 10646)
 
-config OPTION_EGLIBC_CRYPT
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CRYPT
 	bool "Encryption library"
 	default y
 	help
@@ -165,9 +165,9 @@ config OPTION_EGLIBC_CRYPT
 		provides functions for one-way encryption.  Supported
 		encryption algorithms include MD5, SHA-256, SHA-512 and DES.
 
-config OPTION_EGLIBC_CRYPT_UFC
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CRYPT_UFC
 	bool "Ultra fast `crypt' implementation"
-	depends on OPTION_EGLIBC_CRYPT
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_CRYPT
 	help
 		This option group provides ultra fast DES-based implementation
 		of the `crypt' function.  When this option group is disabled,
@@ -176,7 +176,7 @@ config OPTION_EGLIBC_CRYPT_UFC
 		set the errno to ENOSYS if /salt/ passed does not correspond to
 		either MD5, SHA-256 or SHA-512 algorithm.
 
-config OPTION_EGLIBC_DB_ALIASES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_DB_ALIASES
 	bool "Functions for accessing the mail aliases database"
 	help
 		This option group includues functions for looking up mail
@@ -193,7 +193,7 @@ config OPTION_EGLIBC_DB_ALIASES
 		When this option group is disabled, the NSS service libraries
 		also lack support for querying their mail alias tables.
 
-config OPTION_EGLIBC_ENVZ
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ENVZ
 	bool "Functions for handling envz-style environment vectors."
 	help
 		This option group contains functions for creating and operating
@@ -204,11 +204,11 @@ config OPTION_EGLIBC_ENVZ
 
 		This option group includes the following functions:
 
-		envz_add        envz_merge 
+		envz_add        envz_merge
 		envz_entry      envz_remove
-		envz_get        envz_strip 
+		envz_get        envz_strip
 
-config OPTION_EGLIBC_FCVT
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FCVT
 	bool "Functions for converting floating-point numbers to strings"
 	help
 		This option group includes functions for converting
@@ -222,7 +222,7 @@ config OPTION_EGLIBC_FCVT
 		fcvt_r		qfcvt_r
 		gcvt		qgcvt
 
-config OPTION_EGLIBC_FMTMSG
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FMTMSG
 	bool "Functions for formatting messages"
 	default y
 	help
@@ -230,7 +230,7 @@ config OPTION_EGLIBC_FMTMSG
 
 		addseverity    fmtmsg
 
-config OPTION_EGLIBC_FSTAB
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FSTAB
 	bool "Access functions for 'fstab'"
 	default y
 	help
@@ -245,7 +245,7 @@ config OPTION_EGLIBC_FSTAB
 		getfsent       setfsent
 		getfsfile
 
-config OPTION_EGLIBC_FTRAVERSE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_FTRAVERSE
 	bool "Functions for traversing file hierarchies"
 	default y
 	help
@@ -260,7 +260,7 @@ config OPTION_EGLIBC_FTRAVERSE
 		fts_set	nftw64
 		fts_close
 
-config OPTION_EGLIBC_INET
+config KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	bool "Networking support"
 	default y
 	help
@@ -386,19 +386,18 @@ config OPTION_EGLIBC_INET
 		use Unix-domain sockets to communicate with the syslog daemon;
 		syslog is valuable in non-networked contexts.
 
-config OPTION_EGLIBC_SUNRPC
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SUNRPC
 	bool "Support for the Sun 'RPC' protocol."
 	default y
-		depends on OPTION_EGLIBC_INET
-		help
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
+	help
 		This option group includes support for the Sun RPC protocols,
 		including the 'rpcgen' and 'rpcinfo' programs.
 
-config OPTION_EGLIBC_NIS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NIS
 	bool "Support for NIS, NIS+, and the special 'compat' services."
-		depends on OPTION_EGLIBC_INET
-		depends on OPTION_EGLIBC_SUNRPC
-		help
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
+	help
 		This option group includes the NIS, NIS+, and 'compat' Name
 		Service Switch service libraries.  When it is disabled, those
 		services libraries are not installed; you should remove any
@@ -407,9 +406,9 @@ config OPTION_EGLIBC_NIS
 		This option group depends on the OPTION_EGLIBC_INET option
 		group; you must enable that to enable this option group.
 
-config OPTION_EGLIBC_ADVANCED_INET6
+config KEMBTK_EGLIBC_OPTION_EGLIBC_ADVANCED_INET6
 	bool "IPv6 Advanced Sockets API support (RFC3542)"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes the functions specified by RFC 3542,
 		"Advanced Sockets Application Program Interface (API) for
@@ -437,16 +436,16 @@ config OPTION_EGLIBC_ADVANCED_INET6
 		inet6_rth_segments
 		inet6_rth_space
 
-config OPTION_EGLIBC_INET_ANL
+config KEMBTK_EGLIBC_OPTION_EGLIBC_INET_ANL
 	bool "Asynchronous name lookup"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes the `libanl' library which
 		provides support for asynchronous name lookup.
 
-config OPTION_EGLIBC_RCMD
+config KEMBTK_EGLIBC_OPTION_EGLIBC_RCMD
 	bool "Support for 'rcmd' and related library functions"
-	depends on OPTION_EGLIBC_INET
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_INET
 	help
 		This option group includes functions for running commands on
 		remote machines via the 'rsh' protocol, and doing authentication
@@ -462,7 +461,7 @@ config OPTION_EGLIBC_RCMD
 		rresvport       ruserpass
 		rresvport_af
 
-config OPTION_EGLIBC_LIBM
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	bool "libm (math library)"
 	default y
 	help
@@ -481,8 +480,8 @@ config OPTION_EGLIBC_LIBM
 		group, you will not be able to build 'libstdc++' against the
 		resulting EGLIBC installation.
 
-config OPTION_EGLIBC_LIBM_BIG
-	depends on OPTION_EGLIBC_LIBM
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM_BIG
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM
 	bool "Math library with double precision functions"
 	default y
 	help
@@ -497,14 +496,14 @@ config OPTION_EGLIBC_LIBM_BIG
 		This option group is useful for systems that do not rely on
 		precise floating point math.
 
-config OPTION_EGLIBC_LOCALES
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALES
 	bool "Locale definitions"
 	help
 		This option group includes all locale definitions other than
 		that for the "C" locale.  If this option group is omitted, then
 		only the "C" locale is supported.
 
-config OPTION_EGLIBC_MEMUSAGE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE
 	bool "Memory profiling library"
 	default y
 	help
@@ -512,8 +511,11 @@ config OPTION_EGLIBC_MEMUSAGE
 		the `memusage' and `memusagestat' utilities.
 		These components provide memory profiling functions.
 
-		config OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
-
+config EMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+	int "Libmemusage library buffers size"
+	default 512
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_MEMUSAGE
+	help
 		Libmemusage library buffers the profiling data in memory
 		before writing it out to disk.  By default, the library
 		allocates 1.5M buffer, which can be substantial for some
@@ -524,7 +526,7 @@ config OPTION_EGLIBC_MEMUSAGE
 		so setting this option to the value of 512 will reduce the size
 		of the memory buffer to 24K.
 
-config OPTION_EGLIBC_NSSWITCH
+config EMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
 	bool "Name service switch (nsswitch) support"
 	default y
 	help
@@ -541,8 +543,10 @@ config OPTION_EGLIBC_NSSWITCH
 		'option-groups.config' file must set the following two
 		variables:
 
-		OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
-
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
+	string "Alternate file for nsswitch.conf (see below help please)"
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	help
 		Set this to the name of a file whose contents observe the
 		same syntax as an ordinary '/etc/nsswitch.conf' file.  The
 		EGLIBC build process parses this file just as EGLIBC would
@@ -564,8 +568,10 @@ config OPTION_EGLIBC_NSSWITCH
 		you will probably want to delete references to databases not
 		needed on your system.
 
-		OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
-
+config KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+	string "Alternate nss/fixed-nsswitch.functions file (see below help please)"
+	depends on !KEMBTK_EGLIBC_OPTION_EGLIBC_NSSWITCH
+	help
 		The EGLIBC build process uses this file to decide which
 		functions to make available from which service libraries.
 		The file 'nss/fixed-nsswitch.functions' serves as a sample
@@ -601,7 +607,7 @@ config OPTION_EGLIBC_NSSWITCH
 		service library, which uses the Domain Name System network
 		protocol to answer queries.
 
-config OPTION_EGLIBC_RTLD_DEBUG
+config KEMBTK_EGLIBC_OPTION_EGLIBC_RTLD_DEBUG
 	bool "Runtime linker debug print outs"
 	default y
 	help
@@ -614,7 +620,7 @@ config OPTION_EGLIBC_RTLD_DEBUG
 		In particular, the `--unused' ldd option will not work
 		correctly.
 
-config OPTION_EGLIBC_SPAWN
+config KEMBTK_EGLIBC_OPTION_EGLIBC_SPAWN
 	bool "Support for POSIX posix_spawn functions"
 	help
 		This option group includes the POSIX functions for executing
@@ -650,7 +656,7 @@ config OPTION_EGLIBC_SPAWN
 		disabled, those programs will only operate on uncompressed
 		charmap files.
 
-config OPTION_EGLIBC_STREAMS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS
 	bool "Support for accessing STREAMS."
 	help
 		This option group includes functions for reading and writing
@@ -666,7 +672,7 @@ config OPTION_EGLIBC_STREAMS
 		isastream       fdetach
 		putmsg
 
-config OPTION_EGLIBC_UTMP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	bool "Older access functions for 'utmp' login records"
 	default y
 	help
@@ -694,9 +700,9 @@ config OPTION_EGLIBC_UTMP
 
 		libutil.so (and libutil.a)
 
-config OPTION_EGLIBC_GETLOGIN
+config KEMBTK_EGLIBC_OPTION_EGLIBC_GETLOGIN
 	bool "The getlogin function"
-	depends on OPTION_EGLIBC_UTMP
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	default y
 	help
 		This function group includes the 'getlogin' and 'getlogin_r'
@@ -707,9 +713,9 @@ config OPTION_EGLIBC_GETLOGIN
 		fall back on 'getlogin' to find the user's login name for tilde
 		expansion when the 'HOME' environment variable is not set.
 
-config OPTION_EGLIBC_UTMPX
+config KEMBTK_EGLIBC_OPTION_EGLIBC_UTMPX
 	bool "POSIX access functions for 'utmp' login records"
-	depends on OPTION_EGLIBC_UTMP    
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_UTMP
 	help
 		This option group includes the POSIX functions for reading and
 		writing user login records in the 'utmp' file (usually
@@ -730,13 +736,13 @@ config OPTION_EGLIBC_UTMPX
 		updwtmpx
 		utmpxname
 
-config OPTION_EGLIBC_IDN
+config KEMBTK_EGLIBC_OPTION_EGLIBC_IDN
 	bool "International domain names support"
 	help
 		This option group includes the `libcidn' library which
 		provides support for international domain names.
 
-config OPTION_EGLIBC_WORDEXP
+config KEMBTK_EGLIBC_OPTION_EGLIBC_WORDEXP
 	bool "Shell-style word expansion"
 	default y
 	help
@@ -744,7 +750,7 @@ config OPTION_EGLIBC_WORDEXP
 		performing word expansion in the manner of the shell, and the
 		accompanying 'wordfree' function.
 
-config OPTION_POSIX_C_LANG_WIDE_CHAR
+config KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	bool "ISO C library wide character functions, excluding I/O"
 	help
 		This option group includes the functions defined by the ISO C
@@ -773,9 +779,9 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
 		mbrlen        wcscoll       wcstol
 		mbrtowc       wcscpy        wcstold
 
-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+config KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 	bool "Input and output functions for wide characters"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes functions for reading and writing
 		wide characters to and from <stdio.h> streams.
@@ -795,7 +801,7 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		fgetws_unlocked           getwchar_unlocked
 		fputwc_unlocked           putwc_unlocked
 		fputws_unlocked           putwchar_unlocked
-		    
+
 		Note that the GNU standard C++ library, 'libstdc++.so', uses
 		some of these functions; you will not be able to link or run
 		C++ programs if you disable this option group.
@@ -819,9 +825,9 @@ config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
 		option group disabled, the function returns NULL, and sets
 		errno to EINVAL.
 
-config OPTION_EGLIBC_LOCALE_CODE
+config KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	bool "Locale functions"
-	depends on OPTION_POSIX_C_LANG_WIDE_CHAR
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR
 	help
 		This option group includes locale support functions, programs,
 		and libraries.  With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
@@ -842,9 +848,9 @@ config OPTION_EGLIBC_LOCALE_CODE
 		group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
 		disable OPTION_EGLIBC_CATGETS.
 
-config OPTION_EGLIBC_CATGETS
+config KEMBTK_EGLIBC_OPTION_EGLIBC_CATGETS
 	bool "Functions for accessing message catalogs"
-	depends on OPTION_EGLIBC_LOCALE_CODE
+	depends on KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE
 	help
 		This option group includes functions for accessing message
 		catalogs: catopen, catclose, and catgets.
@@ -852,7 +858,7 @@ config OPTION_EGLIBC_CATGETS
 		This option group depends on the OPTION_EGLIBC_LOCALE_CODE
 		option group; if you disable that, you must also disable this.
 
-config OPTION_POSIX_REGEXP
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	bool "Regular expressions"
 	default y
 	help
@@ -874,9 +880,9 @@ config OPTION_POSIX_REGEXP
 		<regexp.h> header file, 'compile', 'step', and 'advance', is
 		omitted.
 
-config OPTION_POSIX_REGEXP_GLIBC
+config KEMBTK_EGLIBC_OPTION_POSIX_REGEXP_GLIBC
 	bool "Regular expressions from GLIBC"
-	depends on OPTION_POSIX_REGEXP
+	depends on KEMBTK_EGLIBC_OPTION_POSIX_REGEXP
 	help
 		This option group specifies which regular expression
 		library to use.  The choice is between regex
diff --git a/kconfig/eglibc.kconfig b/kconfig/eglibc.kconfig
index 89df441..828529c 100644
--- a/kconfig/eglibc.kconfig
+++ b/kconfig/eglibc.kconfig
@@ -70,18 +70,18 @@ config EMBTK_EGLIBC_NEED_PATCH
 	default y
 
 if EMBTK_EGLIBC_VERSION_2_11
-source "kconfig/option-groups.def-2.11"
+source "kconfig/eglibc-2.11.kconfig"
 endif
 
 if EMBTK_EGLIBC_VERSION_2_10
-source "kconfig/option-groups.def-2.10"
+source "kconfig/eglibc-2.10.kconfig"
 endif
 
 if EMBTK_EGLIBC_VERSION_2_9
-source "kconfig/option-groups.def-2.9"
+source "kconfig/eglibc-2.9.kconfig"
 endif
 
 if EMBTK_EGLIBC_VERSION_TRUNK
-source "kconfig/option-groups.def-trunk"
+source "kconfig/eglibc-trunk.kconfig"
 endif
 
diff --git a/kconfig/gcc.kconfig b/kconfig/gcc.kconfig
index 66ff3b2..f574681 100644
--- a/kconfig/gcc.kconfig
+++ b/kconfig/gcc.kconfig
@@ -81,9 +81,9 @@ config EMBTK_GCC_LANGUAGE_CPP
 	select KEMBTK_UCLIBC_UCLIBC_SUSV3_LEGACY if EMBTK_CLIB_UCLIBC
 	select KEMBTK_UCLIBC_UCLIBC_CTOR_DTOR if EMBTK_CLIB_UCLIBC
 	select KEMBTK_UCLIBC_UCLIBC_DYNAMIC_ATEXIT if EMBTK_CLIB_UCLIBC
-	select OPTION_EGLIBC_LIBM if EMBTK_CLIB_EGLIBC
-	select OPTION_POSIX_C_LANG_WIDE_CHAR if EMBTK_CLIB_EGLIBC
-	select OPTION_POSIX_WIDE_CHAR_DEVICE_IO if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_EGLIBC_LIBM if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO if EMBTK_CLIB_EGLIBC
 	help
 	 Your toolchain will be able to build C++ source code
 
diff --git a/mk/eglibc-2.10-options.mk b/mk/eglibc-2.10-options.mk
index 2cf53ab..a4cd022 100644
--- a/mk/eglibc-2.10-options.mk
+++ b/mk/eglibc-2.10-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,34 +23,34 @@
 # \date         May 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-2.11-options.mk b/mk/eglibc-2.11-options.mk
index 639daf0..1544f64 100644
--- a/mk/eglibc-2.11-options.mk
+++ b/mk/eglibc-2.11-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,36 +23,36 @@
 # \date         Nov 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BIG_MACROS		\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_MEMUSAGE			\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BIG_MACROS=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_MEMUSAGE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-2.9-options.mk b/mk/eglibc-2.9-options.mk
index ec640dd..797104f 100644
--- a/mk/eglibc-2.9-options.mk
+++ b/mk/eglibc-2.9-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,29 +23,29 @@
 # \date         May 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc-trunk-options.mk b/mk/eglibc-trunk-options.mk
index 1d3a345..21587a2 100644
--- a/mk/eglibc-trunk-options.mk
+++ b/mk/eglibc-trunk-options.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -23,42 +23,42 @@
 # \date         August 2009
 ################################################################################
 
-EGLIBC_OPTIONS := OPTION_EGLIBC_ADVANCED_INET6		\
-		OPTION_EGLIBC_BACKTRACE			\
-		OPTION_EGLIBC_BIG_MACROS		\
-		OPTION_EGLIBC_BSD			\
-		OPTION_EGLIBC_CXX_TESTS			\
-		OPTION_EGLIBC_CATGETS			\
-		OPTION_EGLIBC_CHARSETS			\
-		OPTION_EGLIBC_CRYPT			\
-		OPTION_EGLIBC_CRYPT_UFC			\
-		OPTION_EGLIBC_DB_ALIASES		\
-		OPTION_EGLIBC_ENVZ			\
-		OPTION_EGLIBC_FCVT			\
-		OPTION_EGLIBC_FMTMSG			\
-		OPTION_EGLIBC_FSTAB			\
-		OPTION_EGLIBC_FTRAVERSE			\
-		OPTION_EGLIBC_GETLOGIN			\
-		OPTION_EGLIBC_IDN			\
-		OPTION_EGLIBC_INET			\
-		OPTION_EGLIBC_INET_ANL			\
-		OPTION_EGLIBC_LIBM			\
-		OPTION_EGLIBC_LIBM_BIG			\
-		OPTION_EGLIBC_LOCALES			\
-		OPTION_EGLIBC_LOCALE_CODE		\
-		OPTION_EGLIBC_MEMUSAGE			\
-		OPTION_EGLIBC_NIS			\
-		OPTION_EGLIBC_NSSWITCH			\
-		OPTION_EGLIBC_RCMD			\
-		OPTION_EGLIBC_RTLD_DEBUG		\
-		OPTION_EGLIBC_SPAWN			\
-		OPTION_EGLIBC_STREAMS			\
-		OPTION_EGLIBC_SUNRPC			\
-		OPTION_EGLIBC_UTMP			\
-		OPTION_EGLIBC_UTMPX			\
-		OPTION_EGLIBC_WORDEXP			\
-		OPTION_POSIX_C_LANG_WIDE_CHAR		\
-		OPTION_POSIX_REGEXP			\
-		OPTION_POSIX_REGEXP_GLIBC		\
-		OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+OPTION_EGLIBC_ADVANCED_INET6=n
+OPTION_EGLIBC_BACKTRACE=n
+OPTION_EGLIBC_BIG_MACROS=n
+OPTION_EGLIBC_BSD=n
+OPTION_EGLIBC_CXX_TESTS=n
+OPTION_EGLIBC_CATGETS=n
+OPTION_EGLIBC_CHARSETS=n
+OPTION_EGLIBC_CRYPT=n
+OPTION_EGLIBC_CRYPT_UFC=n
+OPTION_EGLIBC_DB_ALIASES=n
+OPTION_EGLIBC_ENVZ=n
+OPTION_EGLIBC_FCVT=n
+OPTION_EGLIBC_FMTMSG=n
+OPTION_EGLIBC_FSTAB=n
+OPTION_EGLIBC_FTRAVERSE=n
+OPTION_EGLIBC_GETLOGIN=n
+OPTION_EGLIBC_IDN=n
+OPTION_EGLIBC_INET=n
+OPTION_EGLIBC_INET_ANL=n
+OPTION_EGLIBC_LIBM=n
+OPTION_EGLIBC_LIBM_BIG=n
+OPTION_EGLIBC_LOCALES=n
+OPTION_EGLIBC_LOCALE_CODE=n
+OPTION_EGLIBC_MEMUSAGE=n
+OPTION_EGLIBC_NIS=n
+OPTION_EGLIBC_NSSWITCH=n
+OPTION_EGLIBC_RCMD=n
+OPTION_EGLIBC_RTLD_DEBUG=n
+OPTION_EGLIBC_SPAWN=n
+OPTION_EGLIBC_STREAMS=n
+OPTION_EGLIBC_SUNRPC=n
+OPTION_EGLIBC_UTMP=n
+OPTION_EGLIBC_UTMPX=n
+OPTION_EGLIBC_WORDEXP=n
+OPTION_POSIX_C_LANG_WIDE_CHAR=n
+OPTION_POSIX_REGEXP=n
+OPTION_POSIX_REGEXP_GLIBC=n
+OPTION_POSIX_WIDE_CHAR_DEVICE_IO=n
 
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index f263906..79111d7 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
 # This program is free software; you can distribute it and/or modify it
 # under the terms of the GNU General Public License
@@ -38,8 +38,7 @@ else
 EGLIBC_FLOAT_TYPE := --with-fp=yes
 endif
 
-#EGLIBC options
-include $(EMBTK_ROOT)/mk/eglibc-options-parse.mk
+OPTION_GROUPS_FILE = $(EMBTK_ROOT)/mk/eglibc-$(EGLIBC_VERSION)-options.mk
 
 eglibc-headers_install: $(EGLIBC_HEADERS_BUILD_DIR)/.installed
 eglibc_install: $(EGLIBC_BUILD_DIR)/.installed
@@ -132,3 +131,18 @@ $(EGLIBC_BUILD_DIR)/.configured:
 	--disable-profile --without-gd --without-cvs --enable-add-ons \
 	--enable-kernel="2.6.0"
 	@touch $@
+
+EGLIBC_OPTIONS_PARSE:
+	$(call EMBTK_GENERIC_MESSAGE,"Parsing \
+	eglibc-$(EGLIBC_VERSION) option groups...")
+	@cat $(OPTION_GROUPS_FILE) > $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "# From embtoolkit-$(EMBTK_VERSION) configuration menu #" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@grep "CONFIG_KEMBTK_EGLIBC_" $(EMBTK_ROOT)/.config | \
+	sed -e 's/CONFIG_KEMBTK_EGLIBC_*//g' \
+	>> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@sed -i 's/"//g' $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
+	@cp $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config \
+	$(EGLIBC_BUILD_DIR)/option-groups.config
+
diff --git a/packages/misc/gettext/gettext.kconfig b/packages/misc/gettext/gettext.kconfig
index 0ab1fc6..db5678a 100644
--- a/packages/misc/gettext/gettext.kconfig
+++ b/packages/misc/gettext/gettext.kconfig
@@ -25,9 +25,9 @@
 config EMBTK_HAVE_GETTEXT
 	bool "Have gettext"
 	select EMBTK_HAVE_NCURSES
-	select OPTION_POSIX_C_LANG_WIDE_CHAR if EMBTK_CLIB_EGLIBC
-	select OPTION_POSIX_WIDE_CHAR_DEVICE_IO if EMBTK_CLIB_EGLIBC
-	select OPTION_EGLIBC_LOCALE_CODE if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_POSIX_C_LANG_WIDE_CHAR if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_POSIX_WIDE_CHAR_DEVICE_IO if EMBTK_CLIB_EGLIBC
+	select KEMBTK_EGLIBC_OPTION_EGLIBC_LOCALE_CODE if EMBTK_CLIB_EGLIBC
 	select KEMBTK_UCLIBC_UCLIBC_HAS_WCHAR if EMBTK_CLIB_UCLIBC
 	select KEMBTK_UCLIBC_UCLIBC_HAS_LOCALE if EMBTK_CLIB_UCLIBC
 	help
diff --git a/packages/misc/ncurses/ncurses.kconfig b/packages/misc/ncurses/ncurses.kconfig
index a176daf..fdf3f69 100644
--- a/packages/misc/ncurses/ncurses.kconfig
+++ b/packages/misc/ncurses/ncurses.kconfig
@@ -24,6 +24,7 @@
 
 config EMBTK_HAVE_NCURSES
 	bool "Have ncurses"
+	select KEMBTK_EGLIBC_OPTION_EGLIBC_CHARSETS if EMBTK_CLIB_EGLIBC
 	help
 		The Ncurses (new curses) library is a free software emulation of
 		curses in System V Release 4.0, and more. It uses Terminfo