[src/trunk]: src/external/mit/xorg/server/drivers/xf86-input-keyboard only de...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/89f9a1b89e76
branches:  trunk
changeset: 764612:89f9a1b89e76
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Apr 28 23:28:11 2011 +0000

description:
only default to wskbd where we used to do so with Xorg -configure and where
we know the kbd driver has a translation map

diffstat:

 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile |  12 ++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r e272dd05c55d -r 89f9a1b89e76 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
--- a/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Thu Apr 28 21:39:34 2011 +0000
+++ b/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Thu Apr 28 23:28:11 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2010/11/29 09:34:40 skrll Exp $
+#      $NetBSD: Makefile,v 1.12 2011/04/28 23:28:11 macallan Exp $
 
 DRIVER=                xf86-input-keyboard
 DRIVER_NAME=   kbd_drv
@@ -9,6 +9,16 @@
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "Xcats"
 CPPFLAGS+=     -DPCVT_SUPPORT
 .endif
+
+# turns out we can't use wskbd everywhere without a couple more translation
+# tables in the X driver so make it the default only where we know it will work
+
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
+    ${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
+    ${MACHINE} == "shark"
+CPPFLAGS+=     -DDEFAULT_TO_WSKBD
+.endif
+
 CPPFLAGS+=     -DWSCONS_SUPPORT
 CPPFLAGS+=     -DXKB
 CPPFLAGS.kbd.c=        -D__XKBDEFRULES__=${__XKBDEFRULES__}