From 24383056d0513cc588cee5cee78f1cba2c0fbe89 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Sat, 8 Nov 2008 13:04:20 -0500 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20recommend=20fixing=20HAL=20if?= =?UTF-8?q?=20HAL=20support=20is=20disabled.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As reported in http://bugs.freedesktop.org/show_bug.cgi?id=18438 the server suggests reconfiguring HAL if AllowEmptyInput is enabled and no input devices are known. Instead of that notice, if HAL is disabled at configure time, AllowEmptyInput is enabled in the config and no input devices are found report those facts and recommend disabling AllowEmptyInput. --- hw/xfree86/common/xf86Config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 0466c63e8..0583f0fc7 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1494,9 +1494,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) } if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) { +#ifdef CONFIG_HAL xf86Msg(X_INFO, "The server relies on HAL to provide the list of " "input devices.\n\tIf no devices become available, " "reconfigure HAL or disable AllowEmptyInput.\n"); +#else + xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); +#endif } return TRUE;