diff options
author | Thomas Klausner <wiz@NetBSD.org> | 2013-07-29 23:23:47 +0200 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2013-10-18 16:41:13 -0400 |
commit | 6042ab2647197d9aa09578ed1befe03931737f1c (patch) | |
tree | 30e90874a4ca3fc470780d26b464af32fb304634 | |
parent | 4f1a3cff9dfbfb33fcc6ff0a4ffd1db106301b97 (diff) |
Add some NetBSD feature detection code.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | configure.ac | 16 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/kbd.c | 8 |
3 files changed, 25 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c699f6e..27206c6 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,22 @@ case $host_os in porting it.]) ;; esac +case $host_os in + netbsd*) + case $host in + *powerpc-*|*sparc-*|*sparc64-*|*vax-*) + OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD" + ;; + esac + case "$(uname -m 2>&1)" in + evbarm|sgimips|shark) + OS_FLAGS="$OS_FLAGS -DDEFAULT_TO_WSKBD" + ;; + esac + ;; +esac +AC_SUBST([OS_FLAGS]) + AM_CONDITIONAL(LINUX, [test "x$IS_LINUX" = xyes]) AM_CONDITIONAL(BSD, [test "x$IS_BSD" = xyes]) AM_CONDITIONAL(SOLARIS, [test "x$IS_SOLARIS" = xyes]) diff --git a/src/Makefile.am b/src/Makefile.am index d5d3ef4..8612c87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(OS_FLAGS) kbd_drv_la_LTLIBRARIES = kbd_drv.la kbd_drv_la_LDFLAGS = -avoid-version -module @@ -85,7 +85,15 @@ _X_EXPORT InputDriverRec KEYBOARD = { }; static const char *kbdDefaults[] = { +#ifdef __NetBSD__ +#ifdef DEFAULT_TO_WSKBD + "Protocol", "wskbd", +#else + "Protocol", "standard", +#endif +#else /* NetBSD */ "Protocol", "standard", +#endif /* NetBSD */ "XkbRules", "base", "XkbModel", "pc105", "XkbLayout", "us", |