* change bool to tristate .in Files from N to O

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8317 33e552b5-05e3-0310-8538-816dae2090ed

16 files changed, 56 insertions, 116 deletions

diff --git a/rules/nano.in b/rules/nano.in
index 497cf2e03..08d977103 100644
--- a/rules/nano.in
+++ b/rules/nano.in
@@ -1,5 +1,5 @@
 config NANO
-	bool
+	tristate
 	select NCURSES
 	prompt "nano"
 	help
diff --git a/rules/nanocom.in b/rules/nanocom.in
index 40d0cfedb..a157b8063 100644
--- a/rules/nanocom.in
+++ b/rules/nanocom.in
@@ -1,5 +1,5 @@
 config NANOCOM
-	bool
+	tristate
 	prompt "nanocom"
 	help
 	  This is a lightweight terminal emulator.
diff --git a/rules/ncurses.in b/rules/ncurses.in
index a0551cbdc..5ef46577e 100644
--- a/rules/ncurses.in
+++ b/rules/ncurses.in
@@ -1,5 +1,6 @@
 menuconfig NCURSES
-	bool "ncurses                     "
+	tristate
+	prompt "ncurses                       "
 	select HOST_NCURSES
 	help
 	  The ncurses libraries implement the curses API.  The panel, menu and
@@ -8,12 +9,12 @@ menuconfig NCURSES
 	  `menu', and `form' directories respectively.
 	  For a smaller library select the termcap package instead of ncurses.
 
+if NCURSES
+
 comment "build options ---"
-	depends on NCURSES
 
 config NCURSES_WIDE_CHAR
 	bool "Enable wide char support"
-	depends on NCURSES
 	help
 	  Build ncurses with wide-char/UTF-8 code support. This will create
 	  the wide character libraries used by some other programs to support
@@ -21,7 +22,6 @@ config NCURSES_WIDE_CHAR
 
 config NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
 	bool "Create links for backward compatibility"
-	depends on NCURSES
 	depends on NCURSES_WIDE_CHAR
 	help
 	  Creates links to the wide char libraries with non wide names to support
@@ -30,7 +30,6 @@ config NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR
 
 config NCURSES_BIG_CORE
 	bool "Enable the big core"
-	depends on NCURSES
 	default y
 	help
 	  Disable this entry if your target machine has little memory.
@@ -38,12 +37,10 @@ config NCURSES_BIG_CORE
 	  disabled.
 
 comment "install options ---"
-	depends on NCURSES
 
 config NCURSES_TERMCAP
 	bool "install minimal set of termcap data files"
 	default y
-	depends on NCURSES
 	help
 		Installes the following termcap files:
 		- xterm
@@ -56,7 +53,6 @@ config NCURSES_TERMCAP
 
 config NCURSES_FORM
 	bool "Install libform on the target"
-	depends on NCURSES
 	help
 	  From the manual:
 	  If you have seen those forms on web pages which take input from users
@@ -69,7 +65,6 @@ config NCURSES_FORM
 
 config NCURSES_MENU
 	bool "Install libmenu on the target"
-	depends on NCURSES
 	help
 	  The menus library provides a nice extension to basic curses, through
 	  which you can create menus. It provides a set of functions to create
@@ -78,7 +73,6 @@ config NCURSES_MENU
 
 config NCURSES_PANEL
 	bool "Install libpanel on the target"
-	depends on NCURSES
 	help
 	  This library handles windows on the screen.
 	  From the manual:
@@ -87,3 +81,5 @@ config NCURSES_PANEL
 	  doupdate() and relieves the burden of doing it correctly(bottom up).
 	  The library maintains information about the order of windows, their
  	  overlapping and update the screen properly.
+
+endif
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index d677b64a8..608636ec4 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -1,136 +1,118 @@
 menuconfig NET_SNMP
-	bool "Net-SNMP            "
+	tristate
+	prompt "Net-SNMP                      "
+
+if NET_SNMP
 
 config NET_SNMP_LITTLE_ENDIAN
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "little endian target"
 
 config NET_SNMP_MINI_AGENT
 	bool
 	default y
-	depends on NET_SNMP
 	prompt "minimal agent"
 
 config NET_SNMP_AGENT
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "agent (snmpd)"
 
 config NET_SNMP_APPLICATIONS
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "apps (snmpget, ...)"
 
 config NET_SNMP_SCRIPTS
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "scripts (mib2c, ...)"
 
 config NET_SNMP_MIBS
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "mib files"
 
 config NET_SNMP_MIB_LOADING
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "include code that parses and manipulates mib files"
 
 config NET_SNMP_SNMPV1
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "support for SNMPv1"
 
 config NET_SNMP_SNMPV2C
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "support for SNMPv2c"
 
 config NET_SNMP_DES
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "DES encryption"
 
 config NET_SNMP_MD5
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "MD5 authentication"
 
 config NET_SNMP_SNMPTRAPD
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "agentx subagent code in snmptrapd"
 
 config NET_SNMP_IPV6
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "support for IPv6"
 
 config NET_SNMP_LOCAL_SMUX
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "restrict SMUX connections to localhost (by default)"
 
 config NET_SNMP_DEBUGGING
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "debugging"
 
 config NET_SNMP_DEVELOPER
 	bool
 	default n
-	depends on NET_SNMP
 	prompt "super-duper-extra-compile-warnings using gcc"
 
 config NET_SNMP_DEFAULT_VERSION
 	prompt "default SNMP version: 1, 2 (for SNMPv2c), or 3"
 	string
 	default	"3"
-	depends on NET_SNMP
 
 config NET_SNMP_LOGFILE
 	prompt "logfile location"
 	string
 	default	"/var/log/snmpd.log"
-	depends on NET_SNMP
 
 config NET_SNMP_PERSISTENT_DIR
 	prompt "persistent data storage directory"
 	string
 	default	"/var/net-snmp"
-	depends on NET_SNMP
 
 config NET_SNMP_MIB_MODULES
 	prompt "additional mib modules"
 	string
 	default	""
-	depends on NET_SNMP
 
 config NET_SNMP_DEFAULT_MIBS
 	prompt "default mib id's to read"
 	string
 	default	""
-	depends on NET_SNMP
 
 config NET_SNMP_MIB_INSTALL_DIR
 	prompt "directory to install mib files"
 	string
 	default	"/usr/share/snmp/mibs"
-	depends on NET_SNMP
 
 
+endif
diff --git a/rules/netcat.in b/rules/netcat.in
index bf6b0c060..7c1ac5a2d 100644
--- a/rules/netcat.in
+++ b/rules/netcat.in
@@ -1,6 +1,6 @@
 menuconfig NETCAT
-	bool
-	prompt "netcat              "
+	tristate
+	prompt "netcat                        "
 	help
 	  This is the GNU Flavour of the "netcat" utility.
 
@@ -33,18 +33,18 @@ menuconfig NETCAT
 	  Public License (GPL). See the official GNU Netcat project
 	  homepage for more info:  http://netcat.sourceforge.net/
 
+if NETCAT
 
 config  NETCAT_OLD_HEXDUMP
 	bool
 	prompt "Use the old style hexdump format"
-	depends on NETCAT
 	help
 	  Disabled by default - if unsure, say NO
 
 config  NETCAT_OLD_TELNET
 	bool
 	prompt "Use old telnet codes parsing policy"
-	depends on NETCAT
 	help
 	  Disabled by default - if unsure, say NO
 
+endif
diff --git a/rules/netkit-ftp.in b/rules/netkit-ftp.in
index 4c1edb4e6..fe73f8685 100644
--- a/rules/netkit-ftp.in
+++ b/rules/netkit-ftp.in
@@ -1,5 +1,5 @@
 config NETKIT_FTP
-	bool
+	tristate
 	prompt "NetKit FTP client"
 	help
 	  This is the ftp client from netkit
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 968452da8..5806e6cb2 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -1,5 +1,6 @@
 menuconfig NFSUTILS
-	bool "nfsutils            "
+	tristate 
+	prompt "nfsutils                      "
 	help
 	  The Sun Network Filesystem (NFS) protocol provides transparent remote
    	  access to shared files across networks.  The NFS protocol is designed
@@ -17,13 +18,13 @@ menuconfig NFSUTILS
 
 # -----
 
+if NFSUTILS
+
 comment "build options"
-	depends on NFSUTILS
 
 config	NFSUTILS_V3
 	bool
 	prompt "Enable support for NFSv3"
-	depends on NFSUTILS
 	help
 	  Enable support for version 3 of the NFS protocol.
 	  Revision 3 of the NFS protocol addresses new
@@ -39,22 +40,18 @@ config	NFSUTILS_V3
 config	NFSUTILS_SECURE_STATD
 	bool
 	prompt "Only lockd can use statd (security)"
-	depends on NFSUTILS
 
 config	NFSUTILS_RQUOTAD
 	bool
 	prompt "Enable rquotad"
-	depends on NFSUTILS
 
 config	NFSUTILS_WITH_TCPWRAPPERS
 	bool
 	prompt "Use TCP Wrappers"
-	depends on NFSUTILS
 	select TCPWRAPPER
 
 choice
 	prompt "statd's userid"
-	depends on NFSUTILS
 	default NFSUTILS_RPCUSER_UID
 
 	config NFSUTILS_RPCUSER_UID
@@ -74,62 +71,50 @@ endchoice
 # -----
 
 comment "install options"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_EXPORTFS
 	bool
 	prompt "Install /sbin/exportfs"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_LOCKD
 	bool
 	prompt "Install /sbin/lockd"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_MOUNTD
 	bool
 	prompt "Install /sbin/mountd"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_NFSD
 	bool
 	prompt "Install /sbin/nfsd"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_NFSSTAT
 	bool
 	prompt "Install /sbin/nfsstat"
-	depends on NFSUTILS
 
 config	NFSUTILS_INSTALL_NHFSGRAPH
 	bool
 	prompt "Install /sbin/nhfsgraph"
-	depends on NFSUTILS
 
 config  NFSUTILS_INSTALL_NHFSNUMS
 	bool
 	prompt "Install /sbin/nhfsnums"
-	depends on NFSUTILS
 
 config  NFSUTILS_INSTALL_NHFSRUN
 	bool
 	prompt "Install /sbin/nhfsrun"
-	depends on NFSUTILS
 
 config  NFSUTILS_INSTALL_NHFSSTONE
 	bool
 	prompt "Install /sbin/nhfsstone"
-	depends on NFSUTILS
 
 config  NFSUTILS_INSTALL_SHOWMOUNT
 	bool
 	prompt "Install /sbin/showmount"
-	depends on NFSUTILS
 
 config  NFSUTILS_INSTALL_STATD
 	bool
 	prompt "Install /sbin/statd"
-	depends on NFSUTILS
 # this feature needs /var/lib
 	select ROOTFS_VAR
 	select ROOTFS_VAR_LIB
@@ -137,12 +122,10 @@ config  NFSUTILS_INSTALL_STATD
 # -----
 
 comment "runtime options"
-	depends on NFSUTILS
 
 choice
 	prompt "Kind of startup script"
 	default ROOTFS_ETC_INITD_NFS_DEFAULT
-	depends on NFSUTILS
 
 	config ROOTFS_ETC_INITD_NFS_DEFAULT
 		bool
@@ -162,7 +145,6 @@ choice
 endchoice
 
 config NFSUTILS_INSTALL_USER_EXPORTS
-	depends on NFSUTILS
 	default n
 	bool
 	prompt "Install user's /etc/exports"
@@ -171,3 +153,4 @@ config NFSUTILS_INSTALL_USER_EXPORTS
 	  uses files projectroot/etc/exports in your local
 	  project
 
+endif
diff --git a/rules/nmap.in b/rules/nmap.in
index 9efa94f45..582dfa15d 100644
--- a/rules/nmap.in
+++ b/rules/nmap.in
@@ -1,5 +1,6 @@
 menuconfig NMAP
-	bool "nmap                "
+	tristate
+	prompt "nmap                          "
 	select OPENSSL if NMAP__OPENSSL
 	select OPENSSL
 	select LIBPCRE
@@ -11,18 +12,17 @@ menuconfig NMAP
 	  managing service upgrade schedules, and monitoring host or
 	  service uptime.
 
+if NMAP
+
 config NMAP__OPENSSL
        bool "openssl support"
-       depends on NMAP
 
 config NMAP__IPV6
        bool "ipv6 support (in included libpcap)"
-       depends on NMAP
 
 config NMAP__SERVICES
 	bool "Install nmap-services"
 	default y
-	depends on NMAP
 	help
 	  This will install a set of nmap extensions, consisting of:
 	       nmap-os-fingerprints
@@ -31,4 +31,5 @@ config NMAP__SERVICES
 	       nmap-protocols
 	       nmap-rpc
 
+endif
 
diff --git a/rules/ntp.in b/rules/ntp.in
index 318e02bf0..1080dd533 100644
--- a/rules/ntp.in
+++ b/rules/ntp.in
@@ -1,10 +1,10 @@
 menuconfig NTP
-	bool
+	tristate
 	# FIXME:
 	# gcc     -o ntpdc-layout  ntpdc-layout.o  -lelf
 	# /usr/bin/ld: cannot find -lelf
 	depends on BROKEN
-	prompt "NTP                 "
+	prompt "NTP                           "
 	select OPENSSL if NTP_CRYPTO
 	help
 	  Build the standard NTP Daemon Process an supplementary programs.
@@ -12,13 +12,13 @@ menuconfig NTP
 
 # ----- Compile Options
 
+if NTP
+
 comment "Compile Options"
-	depends on NTP
 
 config NTP_CLOCKCTL
 	bool
 	prompt "Use /dev/clockctl for non-root time control"
-	depends on NTP
 	help
 	  The clockctl device introduces alternative entry
 	  points to these system calls, through a special
@@ -32,7 +32,6 @@ config NTP_CLOCKCTL
 config NTP_DEBUGGING
 	bool
 	prompt "include debugging code"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
@@ -40,7 +39,6 @@ config NTP_DST_MINUTES
 	int
 	prompt "minutes per DST adjustment"
 	default 60
-	depends on NTP
 	help
 	  Enter here how many minutes should be added when
 	  switching to daylight saving time.
@@ -48,35 +46,30 @@ config NTP_DST_MINUTES
 config NTP_BANCOMM
 	bool
 	prompt "Datum/Bancomm bc635/VME interface"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_GPSVME
 	bool
 	prompt "TrueTime GPS receiver/VME interface"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_KMEM
 	bool
 	prompt "read /dev/kmem for tick and/or tickadj"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_ACCURATE_ADJTIME
 	bool
 	prompt "the adjtime () call is accurate"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_TICK_FORCE
 	bool
 	prompt "force a value for 'tick'"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
@@ -84,14 +77,13 @@ config NTP_TICK
 	int
 	prompt "value for 'tick'"
 	default 1
-	depends on NTP && NTP_TICK_FORCE
+	depends on NTP_TICK_FORCE
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_TICKADJ_FORCE
 	bool
 	prompt "force a value for 'tickadj'"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
@@ -99,94 +91,84 @@ config NTP_TICKADJ
 	bool
 	prompt "value for 'tickadj'"
 	default 1
-	depends on NTP && NTP_TICKADJ_FORCE
+	depends on NTP_TICKADJ_FORCE
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_SIMULATOR
 	bool
 	prompt "build/install the NTPD simulator?"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_UDP_WILDCARD
 	bool
 	prompt "use UDP wildcard delivery"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_SLEW_ALWAYS
 	bool
 	prompt "always slew the time"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_STEP_SLEW
 	bool
 	prompt "step and slew the time"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_NTPDATE_STEP
 	bool
 	prompt "if ntpdate should step the time"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_HOURLY_TODR_SYNC
 	bool
 	prompt "if we should sync TODR hourly"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_KERNEL_FLL_BUG
 	bool
 	prompt "if we should avoid a kernel FLL bug"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_IRIG_SAWTOOTH
 	bool
 	prompt "if we should enable the IRIG sawtooth filter"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_NIST
 	bool
 	prompt "if we should enable the NIST lockclock scheme"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_CRYPTO
 	bool
 	prompt "use openssl"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_SNTP
 	bool
 	prompt "Build SNTP"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
 config NTP_ARLIB
 	bool
 	prompt "Compile the async resolver library"
-	depends on NTP
 	help
 	  FIXME: This item needs to be documented
 
+end if 
+
 source "rules/ntp_parse.in"
 source "rules/ntp_nonparse.in"
 
diff --git a/rules/ntpclient.in b/rules/ntpclient.in
index 5ddcd7e87..9056de826 100644
--- a/rules/ntpclient.in
+++ b/rules/ntpclient.in
@@ -1,6 +1,6 @@
 menuconfig NTPCLIENT
-	bool
-	prompt "ntpclient           "
+	tristate
+	prompt "ntpclient              "
 	default n
 	help
 	  ntpclient is a small and efficient client to the NTP protocol.
@@ -18,20 +18,20 @@ menuconfig NTPCLIENT
 
 	  See http://doolittle.icarus.com/ntpclient/ for details.
 
+
+if NTPCLIENT
+
 comment "build options   ---"
-	depends on NTPCLIENT
 
 config NTPCLIENT_BUILD_NTPCLIENT
 	bool
 	prompt "ntpclient"
 	default y
-	depends on NTPCLIENT
 	help
 	  Builds the ntpclient binary
 
 config NTPCLIENT_BUILD_ADJTIMEX
 	bool
-	depends on NTPCLIENT
 	depends on !BB_CONFIG_ADJTIMEX
 	prompt "adjtimex"
 	default y
@@ -39,14 +39,11 @@ config NTPCLIENT_BUILD_ADJTIMEX
 	  Builds the adjtimex binary to control system time
 
 comment "Busybox' adjtimex is in use"
-	depends on NTPCLIENT
 	depends on BB_CONFIG_ADJTIMEX
 
 comment "runtime options   ---"
-	depends on NTPCLIENT
 
 config NTPCLIENT_INSTALL_STARTSCRIPT
-	depends on NTPCLIENT
 	bool
 	prompt "Install start script"
 	default y
@@ -56,7 +53,6 @@ config NTPCLIENT_INSTALL_STARTSCRIPT
 choice
 	prompt "Kind of startup script"
 	default ROOTFS_ETC_INITD_NTPCLIENT_DEFAULT
-	depends on NTPCLIENT
 	depends on NTPCLIENT_INSTALL_STARTSCRIPT
 
 	config ROOTFS_ETC_INITD_NTPCLIENT_DEFAULT
@@ -77,7 +73,6 @@ choice
 endchoice
 
 config NTPCLIENT_NTPSERVER_NAME
-	depends on NTPCLIENT
 	depends on NTPCLIENT_INSTALL_STARTSCRIPT
 	string
 	prompt "NTP server name"
@@ -85,3 +80,5 @@ config NTPCLIENT_NTPSERVER_NAME
 	help
 	  This will replace the string @HOST@ in the startup script to the given name.
 	  ntpclient will connect this host to read the current time.
+
+endif
diff --git a/rules/omniorb.in b/rules/omniorb.in
index c91631d76..6a5cb47b4 100644
--- a/rules/omniorb.in
+++ b/rules/omniorb.in
@@ -1,5 +1,5 @@
 config OMNIORB
-	bool
+	tristate
 	depends on BROKEN
 	prompt "omniORB [BROKEN]"
 	help
diff --git a/rules/openafs.in b/rules/openafs.in
index 4e86bb569..d019b3823 100644
--- a/rules/openafs.in
+++ b/rules/openafs.in
@@ -1,5 +1,5 @@
 menuconfig OPENAFS
-	bool
+	tristate
 	prompt "OpenAFS                       "
 	depends on BROKEN
 	help
diff --git a/rules/openntpd.in b/rules/openntpd.in
index 4e53dd5a8..a705c2da1 100644
--- a/rules/openntpd.in
+++ b/rules/openntpd.in
@@ -2,8 +2,8 @@ comment "OpenNTPD conflicts with NTP"
 	depends on NTP && OPENNTPD
 
 menuconfig OPENNTPD
-	bool
-	prompt "OpenNTPD            "
+	tristate
+	prompt "OpenNTPD                      "
 	select ROOTFS_VAR_RUN
 	help
 	  This will install the BSD Open NTPD Daemon
diff --git a/rules/openssh.in b/rules/openssh.in
index d986c1f21..8c60d494c 100644
--- a/rules/openssh.in
+++ b/rules/openssh.in
@@ -1,8 +1,8 @@
 menuconfig OPENSSH
-	bool
+	tristate
 	select ZLIB
 	select OPENSSL
-	prompt "OpenSSH             "
+	prompt "OpenSSH                       "
 	help
 	  ssh (Secure Shell) is a program for logging into a remote machine and
 	  for executing commands on a remote machine. It provides secure
@@ -12,16 +12,16 @@ menuconfig OPENSSH
 	  for rlogin, rsh and rcp, and can be used to provide applications with
 	  a secure communication channel.
 
+if OPENSSH
+
 config OPENSSH_SSH
 	bool "Install ssh (client)"
-	depends on OPENSSH
 	help
 	  Install the client program (ssh) on the target
 
 config OPENSSH_SSHD
 	bool "Install sshd (server)"
 	default y
-	depends on OPENSSH
 	help
 	  Install the openSSH server program (sshd) on the
 	  target
@@ -57,19 +57,18 @@ config ROOTFS_ETC_INITD_OPENSSH
 
 config OPENSSH_SCP
 	bool "Install scp"
-	depends on OPENSSH
 	help
 	  Install the secure copy program (scp) on the target
 
 config OPENSSH_SFTP_SERVER
 	bool "Install sftp-server"
-	depends on OPENSSH
 	help
 	  Install the secure ftp program (sftp) on the target
 
 config OPENSSH_KEYGEN
 	bool "Install ssh-keygen"
 	default y
-	depends on OPENSSH
 	help
 	  Install ssh-keygen on the target
+
+endif
diff --git a/rules/openssl.in b/rules/openssl.in
index 4e48bb016..422ef2698 100644
--- a/rules/openssl.in
+++ b/rules/openssl.in
@@ -1,6 +1,6 @@
 menuconfig OPENSSL
-	prompt "OpenSSL             "
-	bool
+	tristate
+	prompt "OpenSSL                       "
 	help
 	  OpenSSL is a robust, commercial-grade, full-featured
 	  toolkit implementing the Secure Sockets Layer (SSL v2/v3)
diff --git a/rules/oprofile.in b/rules/oprofile.in
index 5207b15db..725dca024 100644
--- a/rules/oprofile.in
+++ b/rules/oprofile.in
@@ -1,5 +1,5 @@
 config OPROFILE
-	bool
+	tristate
 	select LIBPOPT
 	select KERNEL
 	select KERNEL_VMLINUX