summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2011-07-26 20:40:38 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2011-07-27 09:31:02 +1000
commit01de08c7d2c00eef238adba6665896ea3cd7d511 (patch)
tree18cbf6f02455764ddbef7ada2a6e456bd37f61b1
parent3798dd379c1ecf325f9907128fb66d20372f6876 (diff)
configure: set default xkb rules to evdev on Linux
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@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac6
1 files changed, 1 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 4656a83fb..24388259c 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"