On Wed, Jun 02, 2010 at 05:21:31PM -0400, Gaetan Nadon wrote: > The xf86.h file contains external declarations specific to RANDR > If this extension is defined (installed) wacom will not compile > if randrproto is not installed under the same prefix. > Because this is an optional extension, XORG_DRIVER_CHECK_EXT > must be used.
this should really be fixed in the server for the next release. having all input drivers pull in the RandR protocol headers seems a bit silly. Especially since I'm always rambling on about how input drivers shouldn't deal with RandR at all and leave that up to the clients :) Cheers, Peter > move inputproto check to PKG_CHECK_MODULES: > The XORG_DRIVER_CHECK_EXT macro conditionally adds inputproto > to PKG_CHECK_MODULES if this extension is defined in xorg-server.h. > It allows a module to use ifdef XINPUT if the extension is available. > In the case of inputproto, it is part of server and always defined. > In this module, the extension is required and not optional. > > Signed-off-by: Gaetan Nadon <[email protected]> > --- > configure.ac | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index cfe819e..4f66fb9 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -54,11 +54,11 @@ m4_ifndef([XORG_MACROS_VERSION], > XORG_MACROS_VERSION([1.8]) > XORG_DEFAULT_OPTIONS > > -# Store the list of server defined extensions in REQUIRED_MODULES > -XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) > +# Store the list of server defined optional extensions in REQUIRED_MODULES > +XORG_DRIVER_CHECK_EXT(RANDR, randrproto) > > # Obtain compiler/linker options from server and required extensions > -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) > +PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto $REQUIRED_MODULES) > > # Obtain compiler/linker options for the xsetwacom tool > PKG_CHECK_MODULES(X11, x11 xi) > -- > 1.6.0.4 ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
