Module Name: src
Committed By: macallan
Date: Thu Apr 28 23:28:11 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
only default to wskbd where we used to do so with Xorg -configure and where
we know the kbd driver has a translation map
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.11 Mon Nov 29 09:34:40 2010
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Thu Apr 28 23:28:11 2011
@@ -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__}
