On Wed, Mar 19, 2014 at 12:59:49PM -0700, Jason Gerecke wrote: > On Tue, Mar 18, 2014 at 3:54 PM, Peter Hutterer > <peter.hutte...@who-t.net> wrote: > > Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> > > --- > > configure.ac | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 4ba103c..be211f8 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -49,11 +49,13 @@ XORG_WITH_DOXYGEN(1.6.1) > > # Checks for libraries. > > AC_CHECK_LIB([m], [rint]) > > > > +XPROTOS="xproto xext kbproto inputproto randrproto" > > + > > # Obtain compiler/linker options from server and required extensions > > -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7.0] xproto xext kbproto > > inputproto randrproto) > > +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.7.0] $XPROTOS) > > > > # Obtain compiler/linker options for the xsetwacom tool > > -PKG_CHECK_MODULES(X11, x11 xi xrandr xinerama) > > +PKG_CHECK_MODULES(X11, x11 xi xrandr xinerama $XPROTOS) > > > > # Obtain compiler/linker options for libudev used by ISDV4 code > > PKG_CHECK_MODULES(UDEV, libudev) > > -- > > 1.8.5.3 > > > > > > Was this causing a problem, or just something you noticed? It looks > like tools/Makefile.am already pulls in $(XORG_CFLAGS) to get the full > list of headers. Autotools is still somewhat magic to me (and > best-practices an utter mystery), but it seems that either that > reference also needs to be removed, or the above comment for the X11 > prefix should emphasize that this brings in _additional_ > compiler/linker options for building the tools.
I did notice it in the first revision for this series. Any client that e.g. uses XI needs to include XI.h which is provided by the protocol headers. The only reason this worked so far was because AM_CFLAGS are applied to all projects and they pulled in both. And I just realized I didn't split those up in the last revision, so it's not as obvious now. sorry about that, I'll send a follow-up for that. The goal is to have emtpy AM_CFLAGS and tool-specific _CFLAGS depending on what they'd need. Cheers, Peter ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
