Move FEATURE_BUFFERS_USE_foo options to library tuning

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

diff --git a/Config.in b/Config.in
index 3d1759e21e7f347e59fd4d396d1b4b28628a0b11..924a197da7ab5bb66ce0aca8f43c1fa8980716f7 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -61,30 +61,6 @@ config PLATFORM_LINUX
          Answering 'N' here will disable such applets and hide the
          corresponding configuration options.
 
-choice
-       prompt "Buffer allocation policy"
-       default FEATURE_BUFFERS_USE_MALLOC
-       help
-         There are 3 ways BusyBox can handle buffer allocations:
-         - Use malloc. This costs code size for the call to xmalloc.
-         - Put them on stack. For some very small machines with limited stack
-           space, this can be deadly. For most folks, this works just fine.
-         - Put them in BSS. This works beautifully for computers with a real
-           MMU (and OS support), but wastes runtime RAM for uCLinux. This
-           behavior was the only one available for BusyBox versions 0.48 and
-           earlier.
-
-config FEATURE_BUFFERS_USE_MALLOC
-       bool "Allocate with Malloc"
-
-config FEATURE_BUFFERS_GO_ON_STACK
-       bool "Allocate on the Stack"
-
-config FEATURE_BUFFERS_GO_IN_BSS
-       bool "Allocate in the .bss section"
-
-endchoice
-
 config SHOW_USAGE
        bool "Show applet usage messages"
        default y

diff --git a/libbb/Config.src b/libbb/Config.src
index 18a40f2ac308f79d63d841503490e449e818c7ad..00804e31e678f87fb24b449331c96c57bf200298 100644 (file)
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -7,6 +7,30 @@ menu "Busybox Library Tuning"
 
 INSERT
 
+choice
+       prompt "Buffer allocation policy"
+       default FEATURE_BUFFERS_USE_MALLOC
+       help
+         There are 3 ways BusyBox can handle buffer allocations:
+         - Use malloc. This costs code size for the call to xmalloc.
+         - Put them on stack. For some very small machines with limited stack
+           space, this can be deadly. For most folks, this works just fine.
+         - Put them in BSS. This works beautifully for computers with a real
+           MMU (and OS support), but wastes runtime RAM for uCLinux. This
+           behavior was the only one available for BusyBox versions 0.48 and
+           earlier.
+
+config FEATURE_BUFFERS_USE_MALLOC
+       bool "Allocate with Malloc"
+
+config FEATURE_BUFFERS_GO_ON_STACK
+       bool "Allocate on the Stack"
+
+config FEATURE_BUFFERS_GO_IN_BSS
+       bool "Allocate in the .bss section"
+
+endchoice
+
 config PASSWORD_MINLEN
        int "Minimum password length"
        default 6