From 6dbbac5d4fbe1bd84f5dae4a271b4934a366d199 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 6 Apr 2010 18:48:32 +0200
Subject: [PATCH] Move utmp/wtmp support to "General configuration" section

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 Config.in            | 20 ++++++++++++++++++++
 coreutils/Config.in  |  2 +-
 loginutils/Config.in | 16 ----------------
 miscutils/Config.in  |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Config.in b/Config.in
index bb7dd6d5d..323b96cfc 100644
--- a/Config.in
+++ b/Config.in
@@ -252,6 +252,26 @@ config FEATURE_CLEAN_UP
 	  Don't enable this unless you have a really good reason to clean
 	  things up manually.
 
+config FEATURE_UTMP
+	bool "Support utmp file"
+	default n
+	help
+	  The file /var/run/utmp is used to track who is currently logged in.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will create and delete entries there.
+	  "who" apples requires this option.
+
+config FEATURE_WTMP
+	bool "Support wtmp file"
+	default n
+	select FEATURE_UTMP
+	help
+	  The file /var/run/wtmp is used to track when users have logged into
+	  and logged out of the system.
+	  With this option on, certain applets (getty, login, telnetd etc)
+	  will append new entries there.
+	  "last" apples requires this option.
+
 config FEATURE_PIDFILE
 	bool "Support writing pidfiles"
 	default n
diff --git a/coreutils/Config.in b/coreutils/Config.in
index 297f4655d..ead632a31 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -825,7 +825,7 @@ config FEATURE_WC_LARGE
 config WHO
 	bool "who"
 	default n
-	select FEATURE_UTMP
+	depends on FEATURE_UTMP
 	help
 	  who is used to show who is logged on.
 
diff --git a/loginutils/Config.in b/loginutils/Config.in
index f6c0e2e64..a9b5f5a9f 100644
--- a/loginutils/Config.in
+++ b/loginutils/Config.in
@@ -181,22 +181,6 @@ config GETTY
 	help
 	  getty lets you log in on a tty, it is normally invoked by init.
 
-config FEATURE_UTMP
-	bool "Support utmp file"
-	depends on GETTY || LOGIN || SU || WHO
-	default n
-	help
-	  The file /var/run/utmp is used to track who is currently logged in.
-
-config FEATURE_WTMP
-	bool "Support wtmp file"
-	depends on GETTY || LOGIN || SU || LAST
-	default n
-	select FEATURE_UTMP
-	help
-	  The file /var/run/wtmp is used to track when user's have logged into
-	  and logged out of the system.
-
 config LOGIN
 	bool "login"
 	default n
diff --git a/miscutils/Config.in b/miscutils/Config.in
index ebf98f98c..0469b6399 100644
--- a/miscutils/Config.in
+++ b/miscutils/Config.in
@@ -317,7 +317,7 @@ config INOTIFYD
 config LAST
 	bool "last"
 	default n
-	select FEATURE_WTMP
+	depends on FEATURE_WTMP
 	help
 	  'last' displays a list of the last users that logged into the system.