xserver: Branch 'master'

[James Cloos]

 hw/xfree86/common/xf86Config.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 24383056d0513cc588cee5cee78f1cba2c0fbe89
Author: James Cloos <cloos at jhcloos.com>
Date:   Sat Nov 8 13:04:20 2008 -0500

    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.

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 0466c63..0583f0f 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;