[PATCH 1/4] Remove two more define XKB leftovers.

[Peter Hutterer]

On Fri, Feb 13, 2009 at 04:07:08AM -0200, Paulo César Pereira de Andrade wrote:
> Peter Hutterer wrote:
> 
>   I think this may require an
> % egrep '\<XKB\>'-rn xorg/driver/xf86-input-* xorg/xserver
> as it may cause some regressions, most likely on random input
> device sources, as xorg/server should be clean. But most input
> devices have some "useless" comments in configure.ac that should
> be removed, and they will match the egrep pattern above.
>   I think there may be code that was only compiling correctly
> because XKB was always defined.

from what I can see, xf86-input-keyboard, mouse and synaptics are clean.
evdev has an include depending on ifdef XKB but this include is redundant anyway.

Cheers,
  Peter

> 
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> >  configure.ac             |    1 -
> >  include/xorg-server.h.in |    3 ---
> >  2 files changed, 0 insertions(+), 4 deletions(-)
> >
> > diff --git a/configure.ac b/configure.ac
> > index 65e2667..9126d2a 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -1012,7 +1012,6 @@ AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
> >
> >  AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
> >
> > -AC_DEFINE(XKB, 1, [Build XKB])
> >  AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
> >  AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
> >
> > diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
> > index ca6aec2..3189ff3 100644
> > --- a/include/xorg-server.h.in
> > +++ b/include/xorg-server.h.in
> > @@ -100,9 +100,6 @@
> >  /* Support X Input extension */
> >  #undef XINPUT
> >
> > -/* Build XKB */
> > -#undef XKB
> > -
> >  /* XKB default rules */
> >  #undef XKB_DFLT_RULES
> >
> > --
> > 1.6.0.6
>