xserver: Branch 'master'

[Peter Hutterer]

 hw/xfree86/common/xf86Globals.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit ace38fafb062372dcd3d56378b5b8f86525c6241
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Nov 18 08:19:45 2008 +1000

    xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
    
    There's little chance that we'll get the input devices at runtime without HAL,
    we might as well force the server to add mouse/kbd devices automatically -
    just like in the olden days.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index dfc2bd7..db3b684 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -129,9 +129,15 @@ xf86InfoRec xf86Info = {
     .kbdCustomKeycodes          = FALSE,
     .disableRandR               = FALSE,
     .randRFrom                  = X_DEFAULT,
+#ifdef CONFIG_HAL
     .allowEmptyInput            = TRUE,
     .autoAddDevices             = TRUE,
     .autoEnableDevices          = TRUE
+#else
+    .allowEmptyInput            = FALSE,
+    .autoAddDevices             = FALSE,
+    .autoEnableDevices          = FALSE
+#endif
 };
 const char *xf86ConfigFile = NULL;
 const char *xf86InputDeviceList = NULL;