From f53404bdbba23fd46420564565ab815f7c20b101 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 28 Sep 2005 16:55:25 +0000 Subject: [PATCH] Add kbd_mode build system --- ChangeLog | 7 ++++ configure.ac | 24 ++++++++++++++ hw/xfree86/utils/Makefile.am | 1 + hw/xfree86/utils/kbd_mode/Makefile.am | 46 +++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 hw/xfree86/utils/kbd_mode/Makefile.am diff --git a/ChangeLog b/ChangeLog index 80ae57578..07e5d9c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Alan Coopersmith + + * configure.ac: + * hw/xfree86/utils/Makefile.am: + * hw/xfree86/utils/kbd_mode/Makefile.am: + Add kbd_mode build system + 2005-09-27 Kevin E. Martin * XpConfig/C/print/Makefile.am: diff --git a/configure.ac b/configure.ac index 8a750f6a6..6095c325e 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,6 +1044,29 @@ fi AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes]) AM_CONDITIONAL(USE_CURSES, [test x$CURSES = xyes]) +AC_ARG_ENABLE(kbd_mode, AS_HELP_STRING([ --enable-kbd_mode], + [Build kbd_mode utility (default: auto)]), + [BUILD_KBD_MODE=$enable_val], [BUILD_KBD_MODE="auto"]) +if test x$BUILD_KBD_MODE != xno ; then + case $host_os in + *bsd*) + KBD_MODE_TYPE="bsd" +# BUILD_KBD_MODE="yes" # need to test on BSD before enabling + # by default + ;; + solaris*) + KBD_MODE_TYPE="sun" + BUILD_KBD_MODE="yes" # enabled by default + ;; + *) + BUILD_KBD_MODE="no" # disabled by default + ;; + esac +fi +AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes]) +AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) +AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) + CFLAGS="$XSERVER_CFLAGS $CFLAGS" AC_SUBST([CFLAGS]) @@ -1145,6 +1168,7 @@ hw/xfree86/xf8_32bpp/Makefile hw/xfree86/xf8_32wid/Makefile hw/xfree86/utils/Makefile hw/xfree86/utils/ioport/Makefile +hw/xfree86/utils/kbd_mode/Makefile hw/xfree86/utils/pcitweak/Makefile hw/xfree86/utils/scanpci/Makefile hw/xfree86/utils/xorgcfg/Makefile diff --git a/hw/xfree86/utils/Makefile.am b/hw/xfree86/utils/Makefile.am index 30734730c..54e338aa9 100644 --- a/hw/xfree86/utils/Makefile.am +++ b/hw/xfree86/utils/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ ioport \ + kbd_mode \ pcitweak \ scanpci \ xorgcfg \ diff --git a/hw/xfree86/utils/kbd_mode/Makefile.am b/hw/xfree86/utils/kbd_mode/Makefile.am new file mode 100644 index 000000000..f95a3b722 --- /dev/null +++ b/hw/xfree86/utils/kbd_mode/Makefile.am @@ -0,0 +1,46 @@ +# $Id$ +# +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, and/or sell copies of the Software, and to permit persons +# to whom the Software is furnished to do so, provided that the above +# copyright notice(s) and this permission notice appear in all copies of +# the Software and that both the above copyright notice(s) and this +# permission notice appear in supporting documentation. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in this Software without prior written authorization +# of the copyright holder. +# + +if BUILD_KBD_MODE +bin_PROGRAMS = kbd_mode + +if BSD_KBD_MODE +INCLUDES = $(XORG_INCS) +kbd_mode_CFLAGS = $(XORG_CFLAGS) +kbd_mode_SOURCES = bsd-kbd_mode.c +dist_man1_MANS = bsd-kbd_mode.man +endif + +if SUN_KBD_MODE +kbd_mode_SOURCES = sun-kbd_mode.c +dist_man1_MANS = sun-kbd_mode.man +endif + +endif