11 files changed, 15 insertions, 5 deletions
diff --git a/rules/xorg-font-100dpi-trans.in b/rules/xorg-font-100dpi-trans.in
index 6a34b50f3..e8ceb7e3c 100644
--- a/rules/xorg-font-100dpi-trans.in
+++ b/rules/xorg-font-100dpi-trans.in
@@ -1,4 +1,5 @@
 menu "xorg 100 dpi fonts(transcoded)"
+	depends on MENU_XORG_FONTS
 
 config XORG_FONT_ADOBE_100DPI_TRANS
 	bool
diff --git a/rules/xorg-font-100dpi.in b/rules/xorg-font-100dpi.in
index 75a44e8fb..f18feb715 100644
--- a/rules/xorg-font-100dpi.in
+++ b/rules/xorg-font-100dpi.in
@@ -1,4 +1,5 @@
 menu "xorg 100 dpi fonts            "
+	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-adobe-100dpi.in"
 source "rules/xorg-font-adobe-utopia-100dpi.in"
diff --git a/rules/xorg-font-75dpi-trans.in b/rules/xorg-font-75dpi-trans.in
index 50aa39cf9..63dae80f8 100644
--- a/rules/xorg-font-75dpi-trans.in
+++ b/rules/xorg-font-75dpi-trans.in
@@ -1,4 +1,5 @@
 menu "xorg 75 dpi fonts (transcoded)"
+	depends on MENU_XORG_FONTS
 
 config XORG_FONT_ADOBE_75DPI_TRANS
 	bool
diff --git a/rules/xorg-font-75dpi.in b/rules/xorg-font-75dpi.in
index ae1c04bad..fc2330d4d 100644
--- a/rules/xorg-font-75dpi.in
+++ b/rules/xorg-font-75dpi.in
@@ -1,4 +1,5 @@
 menu "xorg 75 dpi fonts             "
+	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-adobe-75dpi.in"
 source "rules/xorg-font-adobe-utopia-75dpi.in"
diff --git a/rules/xorg-font-base-trans.in b/rules/xorg-font-base-trans.in
index 3b0d28263..5d506eafe 100644
--- a/rules/xorg-font-base-trans.in
+++ b/rules/xorg-font-base-trans.in
@@ -1,4 +1,5 @@
 menu "xorg base fonts(transcoded)   "
+	depends on MENU_XORG_FONTS
 
 config XORG_FONT_MISC_MISC_TRANS
 	bool
diff --git a/rules/xorg-font-base.in b/rules/xorg-font-base.in
index b98010987..fcccb639c 100644
--- a/rules/xorg-font-base.in
+++ b/rules/xorg-font-base.in
@@ -1,4 +1,5 @@
 menu "xorg base fonts               "
+	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-misc-misc.in"
 source "rules/xorg-font-cursor-misc.in"
diff --git a/rules/xorg-font-intl.in b/rules/xorg-font-intl.in
index 660e55cba..fbde3978e 100644
--- a/rules/xorg-font-intl.in
+++ b/rules/xorg-font-intl.in
@@ -1,4 +1,5 @@
 menu "international fonts for X     "
+	depends on MENU_XORG_FONTS
 
 menuconfig XORG_FONT_INTL
 	bool
diff --git a/rules/xorg-font-scalable.in b/rules/xorg-font-scalable.in
index 279447da8..b9376ea85 100644
--- a/rules/xorg-font-scalable.in
+++ b/rules/xorg-font-scalable.in
@@ -1,4 +1,5 @@
 menu "xorg scalable fonts           "
+	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-adobe-utopia-type1.in"
 source "rules/xorg-font-bitstream-speedo.in"
diff --git a/rules/xorg-font-util-alias.in b/rules/xorg-font-util-alias.in
index 9470014de..86d9671cd 100644
--- a/rules/xorg-font-util-alias.in
+++ b/rules/xorg-font-util-alias.in
@@ -1,4 +1,5 @@
 menu "xorg font utils and aliases   "
+	depends on MENU_XORG_FONTS
 
 source "rules/xorg-font-util.in"
 source "rules/xorg-font-alias.in"
diff --git a/rules/xorg-font.in b/rules/xorg-font.in
index 67932bfac..9c4262e64 100644
--- a/rules/xorg-font.in
+++ b/rules/xorg-font.in
@@ -1,9 +1,11 @@
 # xorg proto configuration
 
-menu "xorg fonts            "
-
 source "rules/xorg-fonts.in"
 
+menuconfig MENU_XORG_FONTS
+	bool
+	prompt "xorg fonts            "
+
 source "rules/xorg-font-util-alias.in"
 source "rules/xorg-font-base.in"
 source "rules/xorg-font-base-trans.in"
@@ -13,5 +15,3 @@ source "rules/xorg-font-75dpi.in"
 source "rules/xorg-font-75dpi-trans.in"
 source "rules/xorg-font-scalable.in"
 source "rules/xorg-font-intl.in"
-
-endmenu
diff --git a/rules/xorg-fonts.in b/rules/xorg-fonts.in
index 30ee9baf0..e7ab42eae 100644
--- a/rules/xorg-fonts.in
+++ b/rules/xorg-fonts.in
@@ -1,7 +1,8 @@
 config XORG_FONTS
+	depends on MENU_XORG_FONTS
 	bool
 #	select XORG_FONT_UTIL
-#	select XORG_FONT_ALIAS
+	select XORG_FONT_ALIAS
 	select HOST_XORG_APP_MKFONTDIR
 	select HOST_XORG_APP_MKFONTSCALE
 	select HOST_XORG_APP_BDFTOPCF