* rules/*.in, Kconfig:

	removed 'default n'
	cleaned up menu a bit


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

45 files changed, 31 insertions, 106 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index cf0d7df30..e43683edd 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -132,9 +132,7 @@ config XORG_FONTS
 source "generated/multimedia_xorg_font.in"
 endif
 
-menu "fltk                          "
 source "generated/multimedia_fltk.in"
-endmenu
 
 menu "framebuffer                   "
 source "generated/multimedia_framebuffer.in"
@@ -150,9 +148,7 @@ source "generated/multimedia_gtk.in"
 #source "generated/multimedia_gtk_themes.in"
 endmenu
 
-menu "mplayer                       "
 source "generated/multimedia_mplayer.in"
-endmenu
 
 menu "qt                            "
 source "generated/qt.in"
@@ -174,9 +170,7 @@ menu "tools                         "
 source "generated/multimedia_tools.in"
 endmenu
 
-menu "tslib                         "
 source "generated/multimedia_tslib.in"
-endmenu
 
 menu "xiph codecs                   "
 source "generated/multimedia_xiph.in"
@@ -200,9 +194,7 @@ menu "xorg window managers          "
 source "generated/x_windowmanagers.in"
 endmenu
 
-menu "wxwidgets                     "
 source "generated/multimedia_wxwidgets.in"
-endmenu
 
 endmenu
 
diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index aad9d41a9..85c72bd6a 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -1,8 +1,8 @@
 ## SECTION=multimedia_sound
 
-menuconfig ALSA_UTILS
+config ALSA_UTILS
 	tristate
-	prompt "alsa utils                    "
+	prompt "alsa utils"
 	select NCURSES
 	select ALSA_LIB
 # alsa-utils fails with the salsa-lib
@@ -17,11 +17,3 @@ menuconfig ALSA_UTILS
 	  Some utils to handle the Advanced Linux Sound Architecture.
 	  With these utils you can control your sound device, for
 	  playback and recording of sounds.
-
-if ALSA_UTILS
-
-
-
-
-endif
-
diff --git a/rules/boost.in b/rules/boost.in
index 8b69d6ef4..8e8a4b869 100644
--- a/rules/boost.in
+++ b/rules/boost.in
@@ -29,7 +29,6 @@ comment "Targetinstall Options         "
 config BOOST_INST_NOMT_DBG
 	bool
 	prompt "Install binaries with debug functions"
-	default n
 	help
 	  Install binaries with debugging functions.
 
@@ -44,7 +43,6 @@ config BOOST_INST_MT_DBG
 	bool
 	select BOOST_THREAD
 	prompt "Install binaries with multithread support and debug functions"
-	default n
 	help
 	  Installs binaries with multithread support, needs thread library.
 
diff --git a/rules/cfgsh.in b/rules/cfgsh.in
index f1a1539c3..148e0ea1b 100644
--- a/rules/cfgsh.in
+++ b/rules/cfgsh.in
@@ -1,9 +1,9 @@
 ## SECTION=shell_and_console
-menuconfig CFGSH
+config CFGSH
 	tristate
 	select NCURSES
 	select READLINE
-	prompt "cfgsh                         "
+	prompt "cfgsh"
 	help
 	  cfgsh, the Configuration Shell utility, is a small utility
 	  meant to be used for he configuration of embedded systems.
diff --git a/rules/chrony.in b/rules/chrony.in
index 26804a7e9..50b49dff3 100644
--- a/rules/chrony.in
+++ b/rules/chrony.in
@@ -25,7 +25,6 @@ comment "install options   ---"
 
 config CHRONY_INSTALL_CHRONY_COMMAND
 	bool
-	default n
 	prompt "Install chrony command helper"
 	help
 	  Install a command helper in /usr/bin/chrony_command,
@@ -36,7 +35,6 @@ config CHRONY_INSTALL_CHRONY_COMMAND
 
 config CHRONY_INSTALL_CHRONY_STAT
 	bool
-	default n
 	prompt "Install chrony statistics helper"
 	help
 	  Install a convenience wrapper in /usr/bin/chrony_stat,
diff --git a/rules/cvs.in b/rules/cvs.in
index b2c75f48c..90fae7b3e 100644
--- a/rules/cvs.in
+++ b/rules/cvs.in
@@ -3,7 +3,6 @@
 
 menuconfig CVS
 	tristate
-	default n
 #
 # cvs brings its own libz, but the current
 # ptxdist patch remove it.
@@ -31,7 +30,6 @@ config CVS_NDBM
 
 config CVS_CLIENT
 	bool
-	default n
 	prompt "Build cvs client"
 	help
 	  Include code for running as a remote client
@@ -39,7 +37,6 @@ config CVS_CLIENT
 config CVS_PSSWRD_CLIENT
 	bool
 	depends on CVS_CLIENT
-	default n
 	prompt "Support password authenticated client"
 	help
 	  Enable pserver as a remote access method in the CVS client
@@ -65,7 +62,6 @@ config CVS_FLOW_CONTROL
 config CVS_ENCRYPTION
 	bool
 	depends on CVS_SERVER
-	default n
 	prompt "Enable encryption"
 	help
 	  Enable encryption support
@@ -73,7 +69,6 @@ config CVS_ENCRYPTION
 config CVS_ROOTCOMMIT
 	bool
 	depends on CVS_SERVER
-	default n
 	prompt "Allow root commits"
 	help
 	  Allow the root user to commit files
@@ -84,7 +79,6 @@ config CVS_SERVER_POPULATE_CVSROOT
 	bool
 	depends on CVS_SERVER
 	prompt "Populate CVSROOT files"
-	default n
 	help
 	  This will install a list of files into target's cvs repository. These files
 	  are supporting files; they do not have to exist for cvs to operate, but they
diff --git a/rules/dbus.in b/rules/dbus.in
index 50c107a00..e0489e20d 100644
--- a/rules/dbus.in
+++ b/rules/dbus.in
@@ -16,7 +16,8 @@ menuconfig DBUS
 if DBUS
 
 config DBUS__SELINUX
-	prompt "selinux support"
+	prompt "selinux support [BROKEN]"
+	depends on BROKEN
 	bool
 
 choice
diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index 81ca626bc..423edaf9a 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -27,7 +27,6 @@ comment "build options   ---"
 
 config DNSMASQ_DBUS
 	bool
-	default n
 	prompt "include DBUS support"
 	help
 	  This enables DBUS support in dnsmasq. This is not only a build
diff --git a/rules/fam.in b/rules/fam.in
index d892789d8..ab38180c1 100644
--- a/rules/fam.in
+++ b/rules/fam.in
@@ -25,7 +25,6 @@ if FAM
 
 config FAM_LIBRARY
 	bool
-	default n
 	prompt "Install libfam"
 	help
 	  If there is an application that is linked against libfam check this
diff --git a/rules/fbgrab.in b/rules/fbgrab.in
index 53c957a96..ccab97461 100644
--- a/rules/fbgrab.in
+++ b/rules/fbgrab.in
@@ -3,7 +3,6 @@
 config FBGRAB
 	select LIBPNG
 	tristate
-	default n
 	prompt "fbgrab"
 	help
 	  FBGrab is a framebuffer screenshot program, capturing the
diff --git a/rules/gawk.in b/rules/gawk.in
index eaa15ee41..c0cf1d1d1 100644
--- a/rules/gawk.in
+++ b/rules/gawk.in
@@ -11,10 +11,8 @@ if GAWK
 
 config GAWK_PGAWK
 	bool "Install pgawk"
-	default n
 
 config GAWK_AWKLIB
 	bool "Install awklib"
-	default n
 
 endif
diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in
new file mode 100644
index 000000000..d7dc25fce
--- /dev/null
+++ b/rules/gdb-menu.in
@@ -0,0 +1,13 @@
+## SECTION=debug_tools
+
+menu "gdb                           "
+
+# must be before GDB - used by gdb & gdbserver
+config GDB__VERSION
+       string "gdb version"
+       default 6.8
+       depends on GDB || GDBSERVER
+
+source "generated/debug_tools_gdb.in"
+
+endmenu
diff --git a/rules/gdb.in b/rules/gdb.in
index 9dde9130a..3d857f9ef 100644
--- a/rules/gdb.in
+++ b/rules/gdb.in
@@ -1,9 +1,4 @@
-## SECTION=debug_tools
-
-# must be before GDB - used by gdb & gdbserver
-config GDB__VERSION
-       string "gdb version"
-       default 6.8
+## SECTION=debug_tools_gdb
 
 menuconfig GDB
 	tristate
diff --git a/rules/gdbserver.in b/rules/gdbserver.in
index d4a02ce56..0bc7ae18c 100644
--- a/rules/gdbserver.in
+++ b/rules/gdbserver.in
@@ -1,4 +1,4 @@
-## SECTION=debug_tools
+## SECTION=debug_tools_gdb
 
 menuconfig GDBSERVER
 	tristate
diff --git a/rules/host-localedef.in b/rules/host-localedef.in
index e5de8a1a7..ea40d7995 100644
--- a/rules/host-localedef.in
+++ b/rules/host-localedef.in
@@ -2,4 +2,3 @@
 
 config HOST_LOCALEDEF
 	tristate
-	default n
diff --git a/rules/libconfuse.in b/rules/libconfuse.in
index 13b7468fc..2ea0ae7ca 100644
--- a/rules/libconfuse.in
+++ b/rules/libconfuse.in
@@ -2,7 +2,6 @@
 menuconfig LIBCONFUSE
 	tristate
 	prompt "libconfuse                    "
-	default n
 	help
 	  This is libConfuse, a library for parsing configuration files. It was
 	  called libcfg before, but was changed to not confuse with other
diff --git a/rules/libgmp.in b/rules/libgmp.in
index d4ce012bb..b7127f349 100644
--- a/rules/libgmp.in
+++ b/rules/libgmp.in
@@ -4,7 +4,6 @@
 #
 menuconfig LIBGMP
 	tristate
-	default n
 	prompt "libgmp                        "
 	help
 	  Compiles the GNU Multiprecision libraries for your target system.
@@ -22,7 +21,6 @@ config LIBGMP_SHARED
 
 config LIBGMP_STATIC
 	bool
-	default n
 	prompt "Create static link library"
 	help
 	  Create a static link library and install it into /usr/lib.
diff --git a/rules/liblzo.in b/rules/liblzo.in
index a37f7b0a7..62c74c715 100644
--- a/rules/liblzo.in
+++ b/rules/liblzo.in
@@ -4,7 +4,6 @@
 #
 menuconfig LIBLZO
 	tristate
-	default n
 	prompt "liblzo                        "
 	help
 	  Compiles the LZO compression libraries on your target system.
@@ -22,7 +21,6 @@ config LIBLZO_SHARED
 
 config LIBLZO_STATIC
 	bool
-	default n
 	prompt "Create static link library"
 	help
 	  Create a static link library and install it into /usr/lib.
diff --git a/rules/libpcap.in b/rules/libpcap.in
index 2c6426acf..87471738e 100644
--- a/rules/libpcap.in
+++ b/rules/libpcap.in
@@ -23,7 +23,6 @@ menuconfig LIBPCAP
 config LIBPCAP_IPV6
 	bool
 	depends on LIBPCAP
-	default no
 	prompt "build IPv6-capable version"
 	help
 	  Enable this if you require ipv6 support.
diff --git a/rules/libpv.in b/rules/libpv.in
index 96c48009c..28dbe29f1 100644
--- a/rules/libpv.in
+++ b/rules/libpv.in
@@ -29,7 +29,6 @@ config LIBPV_NEEDS_LIBMQUEUE
 	bool
 	prompt "Posix Message Queue support for kernel 2.6"
 	depends on LIBPV_EVENT
-	default n
 	help
 	 Enable this switch if your glibc doesn't yet support the new Posix
 	 Message Queues the kernel 2.6 already supports. This is
diff --git a/rules/libxml2.in b/rules/libxml2.in
index 5d56368a4..fa362c2b9 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -1,13 +1,10 @@
 ## SECTION=system_libraries
-#
-# LibXML2 - Options updated as of 2.6.19
-# Options valid for 2.6.20 as well. ZLIB missing in both.
-#
 
 menuconfig LIBXML2
 	tristate
 	prompt "libxml2                       "
-	select ZLIB if LIBXML2_ZLIB
+	select ZLIB	if LIBXML2_ZLIB
+#	select PYTHON24	if LIBXML2_PYTHON	# FIXME
 	help
 	  Libxml2 is a XML C parser and toolkit. XML itself is a
 	  metalanguage to design markup languages, i.e. text
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 88cd8797b..c6e31c426 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -12,72 +12,58 @@ config NET_SNMP_MINI_AGENT
 
 config NET_SNMP_AGENT
 	bool
-	default n
 	prompt "agent (snmpd)"
 
 config NET_SNMP_APPLICATIONS
 	bool
-	default n
 	prompt "apps (snmpget, ...)"
 
 config NET_SNMP_SCRIPTS
 	bool
-	default n
 	prompt "scripts (mib2c, ...)"
 
 config NET_SNMP_MIBS
 	bool
-	default n
 	prompt "mib files"
 
 config NET_SNMP_MIB_LOADING
 	bool
-	default n
 	prompt "include code that parses and manipulates mib files"
 
 config NET_SNMP_SNMPV1
 	bool
-	default n
 	prompt "support for SNMPv1"
 
 config NET_SNMP_SNMPV2C
 	bool
-	default n
 	prompt "support for SNMPv2c"
 
 config NET_SNMP_DES
 	bool
-	default n
 	prompt "DES encryption"
 
 config NET_SNMP_MD5
 	bool
-	default n
 	prompt "MD5 authentication"
 
 config NET_SNMP_SNMPTRAPD
 	bool
-	default n
 	prompt "agentx subagent code in snmptrapd"
 
 config NET_SNMP_IPV6
 	bool
-	default n
 	prompt "support for IPv6"
 
 config NET_SNMP_LOCAL_SMUX
 	bool
-	default n
 	prompt "restrict SMUX connections to localhost (by default)"
 
 config NET_SNMP_DEBUGGING
 	bool
-	default n
 	prompt "debugging"
 
 config NET_SNMP_DEVELOPER
 	bool
-	default n
 	prompt "super-duper-extra-compile-warnings using gcc"
 
 config NET_SNMP_DEFAULT_VERSION
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 5673e2ca9..519c91b83 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -128,7 +128,6 @@ choice
 endchoice
 
 config NFSUTILS_INSTALL_USER_EXPORTS
-	default n
 	bool
 	prompt "Install user's /etc/exports"
 	help
diff --git a/rules/ntpclient.in b/rules/ntpclient.in
index 911312a2e..e071002b3 100644
--- a/rules/ntpclient.in
+++ b/rules/ntpclient.in
@@ -2,7 +2,6 @@
 menuconfig NTPCLIENT
 	tristate
 	prompt "ntpclient                     "
-	default n
 	help
 	  ntpclient is a small and efficient client to the NTP protocol.
 
diff --git a/rules/oprofile.in b/rules/oprofile.in
index 627c57055..c05ed8ea7 100644
--- a/rules/oprofile.in
+++ b/rules/oprofile.in
@@ -13,7 +13,6 @@ config OPROFILE
 	select BINUTILS
 	select BINUTILS_OBJDUMP
 	prompt "oprofile tools"
-	default n
 	help
 	  oprofile user space executables including opcontrol, opreport and others
 
diff --git a/rules/php5.in b/rules/php5.in
index ceecabe73..6dc7ca756 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -579,7 +579,8 @@ config PHP5_EXT_MYSQL
 
 config PHP5_EXT_PEAR
 	bool
-	prompt "pear"
+	prompt "pear [BROKEN]"
+	depends on BROKEN
 	help
 	  pear
 
diff --git a/rules/pnputils.in b/rules/pnputils.in
index 3e15f7709..82232fa00 100644
--- a/rules/pnputils.in
+++ b/rules/pnputils.in
@@ -2,7 +2,6 @@
 menuconfig PNPUTILS
 	tristate
 	prompt "pnputils                      "
-	default n
 	help
 	 Builds the pnputils to show debugging information about PNP
 	 devices in your hardware. This is useful for x86 targets only.
@@ -12,7 +11,6 @@ if PNPUTILS
 config PNPUTILS_SETPNP
 	prompt "install setpnp"
 	bool
-	default n
 	help
 	  This utility updates the system resource information for Plug and
 	  Play BIOS device nodes.
diff --git a/rules/pureftpd.in b/rules/pureftpd.in
index 580eb012b..2a470bef8 100644
--- a/rules/pureftpd.in
+++ b/rules/pureftpd.in
@@ -54,7 +54,6 @@ config PUREFTPD_MINIMAL
 config PUREFTPD_SHRINK_MORE
 	bool
 	depends on PUREFTPD_MINIMAL
-	default n
 	prompt "shrink more"
 	help
 	  If you still want to reduce the size, use also this switch and don't
@@ -68,7 +67,6 @@ comment "runtime options   ---"
 config PUREFTPD_ETC_CONFIG
 	bool
 	prompt "default config"
-	default n
 	help
 	  This installs a user defined configuration for pure-ftp. PTXdist
 	  uses files projectroot/etc/pure-ftpd.defaults in your local project
diff --git a/rules/rootfs.in b/rules/rootfs.in
index dde062cb1..4f14ab57e 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -211,7 +211,6 @@ config ROOTFS_VAR_LIB
 	depends on ROOTFS_VAR
 	bool
 	prompt "/var/lib"
-	default n
 	help
 	  Create a /var/lib directory in the root filesystem.
 	  Unless you want to mount a tmpfs on /var you should
diff --git a/rules/rootfs_configfiles.in b/rules/rootfs_configfiles.in
index f174bdea1..f743769c1 100644
--- a/rules/rootfs_configfiles.in
+++ b/rules/rootfs_configfiles.in
@@ -441,7 +441,6 @@ config ROOTFS_ETC_MODULES
 	depends on ROOTFS_ETC_INITD_MODULES
 	bool
 	prompt "project's /etc/modules"
-	default n
 	help
 	  Installs a /etc/modules file from projectroot/etc/modules in
 	  your local project.
@@ -497,7 +496,6 @@ menuconfig ROOTFS_UDHCPC
 config ROOTFS_USER_CROND_CONF
 	depends on ROOTFS
 	depends on ROOTFS_ETC_INITD_CROND
-	default n
 	bool
 	prompt "project's crond configuration"
 	help
@@ -511,7 +509,6 @@ config ROOTFS_USER_CROND_CONF
 config ROOTFS_BUSYBOX_USER_HTTPD_CONF
 	depends on ROOTFS
 	depends on BUSYBOX_HTTPD
-	default n
 	bool
 	prompt "project's httpd.conf configuration"
 	help
diff --git a/rules/rsync.in b/rules/rsync.in
index ec5847203..e55949789 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -15,7 +15,6 @@ comment "build options   ---"
 
 config RSYNC_IPV6
 	bool
-	default n
 	prompt "Support IPV6"
 	help
 	  This switch enables IPV6 support in rsync
diff --git a/rules/rsync3.in b/rules/rsync3.in
index 09dad745e..743d9aded 100644
--- a/rules/rsync3.in
+++ b/rules/rsync3.in
@@ -13,7 +13,6 @@ if RSYNC3
 
 config RSYNC3_IPV6
 	bool
-	default n
 	prompt "Support IPV6"
 	help
 	  This switch enables IPV6 support in rsync
diff --git a/rules/sdl.in b/rules/sdl.in
index 6facfd6c5..3cdea17d6 100644
--- a/rules/sdl.in
+++ b/rules/sdl.in
@@ -3,7 +3,7 @@
 menuconfig SDL
 	tristate
 	prompt "SDL                           "
-	select ALSA_LIB if SDL_ALSA
+	select ALSA_LIB			if SDL_ALSA
 	select XORG_LIB_X11		if SDL_XORG
 	select XORG_LIB_XT		if SDL_XORG
 	select XORG_LIB_XV		if SDL_XORG_XV
diff --git a/rules/smtpclient.in b/rules/smtpclient.in
index 3446690e2..afc44ffba 100644
--- a/rules/smtpclient.in
+++ b/rules/smtpclient.in
@@ -2,7 +2,6 @@
 config SMTPCLIENT
 	tristate
 	prompt "smtpclient"
-	default n
 	help
 	  smtpclient is a small program which can be used to send emails.
 	  Unfortunately it disappeared from www.engelschall.com, so we
diff --git a/rules/sudo.in b/rules/sudo.in
index 25e6657e1..a29661907 100644
--- a/rules/sudo.in
+++ b/rules/sudo.in
@@ -16,7 +16,6 @@ config SUDO__SENDMAIL
 	# FIXME: sendmail support is buggy and searches for
 	# /sbin/sendmail on the host
 	#prompt "sendmail support"
-	default n
 
 config SUDO__ETC_SUDOERS
 	bool "Install sudoers file into /etc"
diff --git a/rules/tcpdump.in b/rules/tcpdump.in
index 62d49f367..740ebce94 100644
--- a/rules/tcpdump.in
+++ b/rules/tcpdump.in
@@ -34,7 +34,6 @@ config TCPDUMP_SMB
 config TCPDUMP_IPV6
 	bool
 	select LIBPCAP_IPV6
-	default no
 	prompt "enable ipv6 (with ipv4) support"
 	help
 	  Enable this if you require ipv6 support. This also requires ipv6
diff --git a/rules/tk.in b/rules/tk.in
index 08fee4868..9ac3b28dd 100644
--- a/rules/tk.in
+++ b/rules/tk.in
@@ -1,8 +1,8 @@
 ## SECTION=multimedia_tk
 
-menuconfig TK
+config TK
 	tristate
-	prompt "tk (tcl/tk)                   "
+	prompt "tk (tcl/tk)"
 	select ROOTFS_DEV
 	depends on TCL
 	depends on BROKEN
diff --git a/rules/uttt.in b/rules/uttt.in
index 362a1cea6..7543e5b36 100644
--- a/rules/uttt.in
+++ b/rules/uttt.in
@@ -1,7 +1,7 @@
 ## SECTION=games
-config UTTT
+menuconfig UTTT
 	tristate
-	prompt "Ultra Tic Tac Toe"
+	prompt "Ultra Tic Tac Toe             "
 	help
 	  Ultra Tic Tac Toe (UTTT) is a console game board package containing
 	  tic tac toe (naughts and crosses) and connect 4 games.
diff --git a/rules/wireshark.in b/rules/wireshark.in
index dfb47c02e..98be28df6 100644
--- a/rules/wireshark.in
+++ b/rules/wireshark.in
@@ -4,7 +4,6 @@ menuconfig WIRESHARK
 	depends on BROKEN
 	# incorrectly runs libgnutls-config from the host while trying
 	# to find out where tls is
-	default n
 	prompt "wireshark                     "
 	select LIBPCAP
 	select GLIB
@@ -18,7 +17,7 @@ if WIRESHARK
 
 config WIRESHARK_TSHARK
 	bool
-	default y
+
 	prompt "tshark"
 	help
 	  This is the textmode version of wireshark
@@ -26,7 +25,6 @@ config WIRESHARK_TSHARK
 # FIXME:
 #config WIRESHARK_WIRESHARK
 #	bool
-#	default n
 #	prompt "wireshark"
 #	help
 #	  This is the graphical version of wireshark
@@ -34,7 +32,6 @@ config WIRESHARK_TSHARK
 # FIXME: Not tested yet
 #config WIRESHARK_IPV6
 #	bool
-#	default n
 #	prompt "support ipv6"
 #	help
 #	  Activate this to support ipv6 in wireshark
diff --git a/rules/xorg-app-setxkbmap.in b/rules/xorg-app-setxkbmap.in
index d2e502e76..5babd5c75 100644
--- a/rules/xorg-app-setxkbmap.in
+++ b/rules/xorg-app-setxkbmap.in
@@ -6,7 +6,6 @@ config XORG_APP_SETXKBMAP
 	depends on XORG_KEYBOARD_MAPPING_SUPPORT
 	prompt "xorg setxkbmap"
 	select XORG_APP_XKBCOMP
-	default n
 	help
 	  This tool is needed to load new keyboard mappings into a running
 	  X server. It can be run locally or remotly. If you are going to build
diff --git a/rules/xorg-app-xkbcomp.in b/rules/xorg-app-xkbcomp.in
index 399fc3d8e..6fda90212 100644
--- a/rules/xorg-app-xkbcomp.in
+++ b/rules/xorg-app-xkbcomp.in
@@ -8,7 +8,6 @@ config XORG_APP_XKBCOMP
 	select XORG_DATA_XKBDATA
 	select XORG_LIB_X11_XKB
 	select XORG_LIB_XKBFILE
-	default n
 	help
 	  Compiles XKB keyboard descriptions. This tool is needed
 	  to load new keyboard mappings into a running X server.
diff --git a/rules/xorg-data-xkbdata.in b/rules/xorg-data-xkbdata.in
index 505637150..ac3043e97 100644
--- a/rules/xorg-data-xkbdata.in
+++ b/rules/xorg-data-xkbdata.in
@@ -6,7 +6,6 @@ config XORG_DATA_XKBDATA
 	depends on XORG_LIB_X11
 	prompt "xkbdata"
 	depends on XORG_KEYBOARD_MAPPING_SUPPORT
-	default n
 	help
 	  These files are required to setup various keyboard mappings.
 	  The tool xkbcomp on the target needs these files, to configure
diff --git a/rules/xorg-lib-Xaw.in b/rules/xorg-lib-Xaw.in
index babf88a22..ba21c8041 100644
--- a/rules/xorg-lib-Xaw.in
+++ b/rules/xorg-lib-Xaw.in
@@ -18,7 +18,6 @@ menuconfig XORG_LIB_XAW
 config XORG_LIB_XAW_V6
 	depends on XORG_LIB_XAW
 	bool
-	default n
 	prompt "Build version 6 (old)"
 	help
 	  If you need release 6 of this library, enable it
@@ -26,7 +25,6 @@ config XORG_LIB_XAW_V6
 config XORG_LIB_XAW_V7
 	depends on XORG_LIB_XAW
 	bool
-	default n
 	prompt "Build version 7 (old)"
 	help
 	  If you need release 7 of this library, enable it
diff --git a/rules/xorg-options.in b/rules/xorg-options.in
index 79577b08b..8c2d08728 100644
--- a/rules/xorg-options.in
+++ b/rules/xorg-options.in
@@ -37,7 +37,6 @@ menu "options                       "
 config XORG_KEYBOARD_MAPPING_SUPPORT
 	bool
 	prompt "support keyboard mappings"
-	default n
 	select XORG_DRIVER_INPUT_KEYBOARD
 	select XORG_APP_XKBCOMP
 	help
@@ -78,7 +77,6 @@ config XORG_OPTIONS_TRANS_TCP
 config XORG_OPTIONS_TRANS_IPV6
 	bool
 	prompt "ipv6 support"
-	default n
 	help
 	  Enable this if your X server needs IPv6 support. If the starting X
 	  server complains about missing IPv6 support you should disable this
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 619d23574..75bf81757 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -231,7 +231,6 @@ config XORG_SERVER_OPT_SECURE_RPC
 	depends on XORG_SERVER
 	bool
 	prompt "secure RPC"
-	default n
 	help
 	  Use secure RPC authentication (SUN-DES-1)
 
@@ -239,7 +238,6 @@ config XORG_SERVER_OPT_XORGCFG
 	depends on XORG_SERVER
 	bool
 	prompt "build xorgcfg GUI config utility"
-	default n
 	help
 	  --enable-xorgcfg
 
@@ -396,7 +394,6 @@ config XORG_SERVER_EXT_DRI
 	depends on XORG_SERVER
 	bool
 	prompt "DRI extension"
-	default n
 	help
 	  Enable support for the Direct Rendering Infrastructure to get 3D
 	  accelerations support. This is meaningless if you don't have DRI