[PATCH] configure: set default xkb rules to evdev on Linux

Julien Cristau jcristau at debian.org
Tue Jul 26 11:40:38 PDT 2011


If config/udev was enabled, this would default to base, which means that
after regen the devices would get the wrong rules, and hilarity would
ensue.

It's probably safe to default to evdev unconditionally on Linux by now.

Reported-by: Bastian Blank <waldi at debian.org>
Signed-off-by: Julien Cristau <jcristau at debian.org>
---
 configure.ac |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4656a83..2438825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1187,11 +1187,7 @@ if test "x$XKB_DFLT_RULES" = x; then
     case $host_os in
     linux*)
         dnl doesn't take AutoAddDevices into account, but whatever.
-        if test "x$CONFIG_HAL" = xyes; then
-            XKB_DFLT_RULES="evdev"
-        else
-            XKB_DFLT_RULES="base"
-        fi
+        XKB_DFLT_RULES="evdev"
         ;;
     *)
         XKB_DFLT_RULES="base"
-- 
1.7.2.5



More information about the xorg-devel mailing list