Twas brillig at 10:48:37 16.01.2010 UTC-08 when [email protected] did gyre and gimble:
AC> Fixes build on non-Linux platforms by restoring the defaults to AC> where they were before commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8, AC> to only enable the Linux kbd, mouse & evdev drivers when building AC> on Linux platforms. AC> Signed-off-by: Alan Coopersmith <[email protected]> AC> --- AC> configure.ac | 32 ++++++++++++++++++++++++++------ AC> 1 files changed, 26 insertions(+), 6 deletions(-) AC> diff --git a/configure.ac b/configure.ac AC> index 8c1085b..a187452 100644 AC> --- a/configure.ac AC> +++ b/configure.ac AC> @@ -641,9 +641,9 @@ AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdriv AC> AC_ARG_ENABLE(xfake, AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto]) AC> AC_ARG_ENABLE(xfbdev, AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto]) AC> dnl kdrive options AC> -AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: enabled)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=yes]) AC> -AC_ARG_ENABLE(kdrive-mouse, AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: enabled)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=yes]) AC> -AC_ARG_ENABLE(kdrive-evdev, AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: enabled)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=yes]) AC> +AC_ARG_ENABLE(kdrive-kbd, AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto]) AC> +AC_ARG_ENABLE(kdrive-mouse, AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto]) AC> +AC_ARG_ENABLE(kdrive-evdev, AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto]) AC> AC> AC> dnl chown/chmod to be setuid root as part of build AC> @@ -1995,9 +1995,6 @@ XEPHYR_LIBS= AC> XEPHYR_INCS= AC> AC> AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) AC> -AM_CONDITIONAL(KDRIVE_KBD, test "x$KDRIVE_KBD" = xyes) AC> -AM_CONDITIONAL(KDRIVE_EVDEV, test "x$KDRIVE_EVDEV" = xyes) AC> -AM_CONDITIONAL(KDRIVE_MOUSE, test "x$KDRIVE_MOUSE" = xyes) AC> AC> if test "$KDRIVE" = yes; then AC> AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) AC> @@ -2072,6 +2069,26 @@ if test "$KDRIVE" = yes; then AC> *linux*) AC> KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la' AC> KDRIVELINUX=yes AC> + if test "x$KDRIVE_EVDEV" = xauto; then AC> + KDRIVE_EVDEV=yes AC> + fi AC> + if test "x$KDRIVE_KBD" = xauto; then AC> + KDRIVE_KBD=yes AC> + fi AC> + if test "x$KDRIVE_MOUSE" = xauto; then AC> + KDRIVE_MOUSE=yes AC> + fi AC> + ;; AC> + *) AC> + if test "x$KDRIVE_EVDEV" = xauto; then AC> + KDRIVE_EVDEV=no AC> + fi AC> + if test "x$KDRIVE_KBD" = xauto; then AC> + KDRIVE_KBD=no AC> + fi AC> + if test "x$KDRIVE_MOUSE" = xauto; then AC> + KDRIVE_MOUSE=no AC> + fi AC> ;; AC> esac AC> KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la' AC> @@ -2090,6 +2107,9 @@ AC_SUBST([KDRIVE_PURE_LIBS]) AC> AC_SUBST([KDRIVE_LOCAL_LIBS]) AC> AC_SUBST([KDRIVE_LIBS]) AC> AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AC> +AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes]) AC> +AM_CONDITIONAL(KDRIVE_KBD, [test "x$KDRIVE_KBD" = xyes]) AC> +AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes]) AC> AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) AC> AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes]) AC> AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) AC> -- AC> 1.5.6.5 Reviewed-by: Mikhail Gusarov <[email protected]> -- http://fossarchy.blogspot.com/
pgpdxEY5x6CCL.pgp
Description: PGP signature
_______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
