- reinstate static for the command string arrray to be gentle to gcc-3.x

[oweals/busybox.git] / debianutils / Config.in

diff --git a/debianutils/Config.in b/debianutils/Config.in
index 146a24e610f424778cdc3c3e215fe390c85f1f85..3d85999ffbfa12863c978c1af17a5aa36f169ed9 100644 (file)
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -5,33 +5,33 @@
 
 menu "Debian Utilities"
 
-config CONFIG_MKTEMP
+config MKTEMP
        bool "mktemp"
        default n
        help
          mktemp is used to create unique temporary files
 
-config CONFIG_PIPE_PROGRESS
+config PIPE_PROGRESS
        bool "pipe_progress"
        default n
        help
          Display a dot to indicate pipe activity.
 
-config CONFIG_READLINK
+config READLINK
        bool "readlink"
        default n
        help
          This program reads a symbolic link and returns the name
          of the file it points to
 
-config CONFIG_FEATURE_READLINK_FOLLOW
+config FEATURE_READLINK_FOLLOW
        bool "Enable canonicalization by following all symlinks (-f)"
        default n
-       depends on CONFIG_READLINK
+       depends on READLINK
        help
          Enable the readlink option (-f).
 
-config CONFIG_RUN_PARTS
+config RUN_PARTS
        bool "run-parts"
        default n
        help
@@ -46,7 +46,14 @@ config CONFIG_RUN_PARTS
          Unless you know that run-parts is used in some of your scripts
          you can safely say N here.
 
-config CONFIG_START_STOP_DAEMON
+config FEATURE_RUN_PARTS_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on RUN_PARTS && GETOPT_LONG
+       help
+         Support long options for the run-parts applet.
+
+config START_STOP_DAEMON
        bool "start-stop-daemon"
        default y
        help
@@ -54,7 +61,23 @@ config CONFIG_START_STOP_DAEMON
          termination of system-level processes, usually the ones
          started during the startup of the system.
 
-config CONFIG_WHICH
+config FEATURE_START_STOP_DAEMON_FANCY
+       bool "Support additional arguments"
+       default y
+       depends on START_STOP_DAEMON
+       help
+         Support additional arguments.
+         -o|--oknodo ignored since we exit with 0 anyway
+         -v|--verbose
+
+config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on START_STOP_DAEMON && GETOPT_LONG
+       help
+         Support long options for the start-stop-daemon applet.
+
+config WHICH
        bool "which"
        default n
        help