Don’t recommend fixing HAL if HAL support is disabled.
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.
This commit is contained in:
parent
b3c7e62664
commit
24383056d0
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user