From 057b2876d4ebaa8cbe60cf710d94bbb9d9eb10cd Mon Sep 17 00:00:00 2001 From: Michael Obster Date: Sun, 10 Oct 2004 11:37:32 +0000 Subject: [PATCH] Michael Obster : modified config.in for an information in the menu (the current state I think can confuse the user) [2004092616205023699] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4478 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/config.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/x11/xfree86/config.in b/package/x11/xfree86/config.in index 095549a06..a4281cc88 100644 --- a/package/x11/xfree86/config.in +++ b/package/x11/xfree86/config.in @@ -20,7 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if pkgcheck xfree86 X || pkgcheck xfree86-cvs X; then +if pkgcheck xfree86 X || pkgcheck xorg X ; then menu_begin MENU_PKG_XFREE86 'XFree86 Options' # bool 'Use a CVS checkout instead of last stable release' \ # ROCKCFG_PKG_XFREE86_CVS 0 @@ -33,9 +33,12 @@ menu_begin MENU_PKG_XFREE86 'XFree86 Options' # pkgremove xfree86-cvs # fi +if [ "$ROCKCFG_PKG_XORG_BUILD" = "1" ] ; then + comment 'This menu is disabled. Please see X.Org menu.' +else bool 'Enable Xinerama support globally' \ ROCKCFG_PKG_XFREE86_XINERAMA 1 - +fi menu_end fi