From 13d384b4ee94933f72ec74a642e49b69c58feb1b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 26 Jul 2010 00:07:17 +0200
Subject: libc-uclibc: move options


diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 4758962..ef8f921 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -150,34 +150,3 @@ config LIBC_UCLIBC_CONFIG_FILE
       Path to the configuration file.
       
       You _must_ provide one (for now).
-
-config LIBC_UCLIBC_LOCALES
-    bool
-    select LIBC_UCLIBC_WCHAR
-    prompt "Add support for locales"
-    default n
-    help
-      Say y if you want uClibc to support localisation.
-
-      Note that seems to be broken on recent uClibc releases.
-
-config LIBC_UCLIBC_LOCALES_PREGEN_DATA
-    bool
-    prompt "Use pregen locales"
-    depends on LIBC_UCLIBC_LOCALES
-    default y
-    help
-      If you see issues with using pre-generated locales data,
-      you can try switching this off.
-      
-      If so, please report the issue, so we can default this
-      to off if too many people complain.
-
-config LIBC_UCLIBC_WCHAR
-    bool
-    prompt "Add support for WCHAR"
-    default n
-    help
-      Say y if you want uClibc to support WCHAR.
-
-      Maybe this is needed, if you're building a C++-Compiler
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 9cfefba..0ca72b8 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -36,3 +36,34 @@ config LIBC_UCLIBC_LNXTHRD
     default ""      if THREADS_NPTL
     default "old"   if LIBC_UCLIBC_LNXTHRD_OLD
     default "new"   if LIBC_UCLIBC_LNXTHRD_NEW
+
+config LIBC_UCLIBC_LOCALES
+    bool
+    select LIBC_UCLIBC_WCHAR
+    prompt "Add support for locales"
+    default n
+    help
+      Say y if you want uClibc to support localisation.
+
+      Note that seems to be broken on recent uClibc releases.
+
+config LIBC_UCLIBC_LOCALES_PREGEN_DATA
+    bool
+    prompt "Use pregen locales"
+    depends on LIBC_UCLIBC_LOCALES
+    default y
+    help
+      If you see issues with using pre-generated locales data,
+      you can try switching this off.
+
+      If so, please report the issue, so we can default this
+      to off if too many people complain.
+
+config LIBC_UCLIBC_WCHAR
+    bool
+    prompt "Add support for WCHAR"
+    default n
+    help
+      Say y if you want uClibc to support WCHAR.
+
+      Maybe this is needed, if you're building a C++-Compiler
-- 
cgit v0.10.2-6-g49f6