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