There should be only one instance of CONFIG_FEATURE_AUTOWIDTH

2 files changed, 7 insertions, 17 deletions

diff --git a/coreutils/Config.in b/coreutils/Config.in
index e23bb754c..3f1e714ef 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -576,14 +576,18 @@ config CONFIG_FEATURE_PRESERVE_HARDLINKS
           Allow cp and mv to preserve hard links.
 
 comment "Common options for ls and more"
-    depends on CONFIG_LS || CONFIG_MORE
+        depends on CONFIG_LS || CONFIG_MORE
 
 config CONFIG_FEATURE_AUTOWIDTH
         bool "  Calculate terminal & column widths"
-        default n
+        default y
         depends on CONFIG_LS || CONFIG_MORE
         help
-          Allow ls and more to calculate terminal and column widths.
+          This option allows utilities such as 'ls' and 'more' to determine the
+          width of the screen, which can allow them to display additional text
+          or avoid wrapping text onto the next line.  If you leave this
+          disabled, your utilities will be especially primitive and will be
+          unable to determine the current screen width.
 
 comment "Common options for df, du, ls"
     depends on CONFIG_DF || CONFIG_DU || CONFIG_LS
diff --git a/util-linux/Config.in b/util-linux/Config.in
index ae17fe31b..42708c93a 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -245,20 +245,6 @@ config CONFIG_FEATURE_USE_TERMIOS
           will be unable to determine the current screen size, and will be
           unable to move the cursor.
 
-comment "Common options for ls and more"
-        depends on CONFIG_LS || CONFIG_MORE
-
-config CONFIG_FEATURE_AUTOWIDTH
-        bool "  Calculate terminal & column widths"
-        default y
-        depends on CONFIG_LS || CONFIG_MORE
-        help
-          This option allows utilities such as 'ls' and 'more' to determine the
-          width of the screen, which can allow them to display additional text
-          or avoid wrapping text onto the next line.  If you leave this
-          disabled, your utilities will be especially primitive and will be
-          unable to determine the current screen width.
-
 config CONFIG_PIVOT_ROOT
         bool "pivot_root"
         default n