On Mon, Sep 14, 2009 at 10:28 PM, Peter Hutterer <[email protected]> wrote: > Protocol requirements were spread throughout configure.ac, leaving us with a > few locations where one DDX asked for a different version of the package > than another. > For each protocol, define <NAME>PROTO="[<name>proto >= version]" and > assemble REQUIRED_MODULES based on these. > > Future changes to protocol versions need to only be done in a single place. > --- > configure.ac | 77 +++++++++++++++++++++++++++++++++++++++++---------------- > 1 files changed, 55 insertions(+), 22 deletions(-) > > diff --git a/configure.ac b/configure.ac > index fcbeed8..891286e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -708,8 +708,41 @@ XEXT_INC='-I$(top_srcdir)/Xext' > XEXT_LIB='$(top_builddir)/Xext/libXext.la' > XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' > > +dnl Optional modules > +VIDEOPROTO="videoproto" > +COMPOSITEPROTO="[compositeproto >= 0.4]" > +RECORDPROTO="[recordproto >= 1.13.99.1]" > +SCRNSAVERPROTO="[scrnsaverproto >= 1.1]" > +RESOURCEPROTO="resourceproto" > +DRIPROTO="xf86driproto" > +REQUIRED_DRI2PROTO="[dri2proto >= 2.1]" > +XINERAMAPROTO="xineramaproto" > +BIGFONTPROTO="[xf86bigfontproto >= 1.2.0]" > +XCALIBRATEPROTO="xcalibrateproto" > +DGAPROTO="[xf86dgaproto >= 2.0.99.1]" > +GLPROTO="[glproto >= 1.4.9]" > +DMXPROTO="dmxproto" > +VIDMODEPROTO="[xf86vidmodeproto >= 2.2.99.1]" > +WINDOWSWMPROTO="[windowswmproto]" > +APPLEWMPROTO="[applewmproto >= 1.4]" > +FIXESPROTO="[fixesproto >= 4.0]"
FYI, the [] quoting in these arguments is unnecessary (I know it's been used a lot in the X scripts). They're m4 quotes, and those are usually only necessary inside the actual macro calls (and just to be safe then). Autoconf will just remove the brackets in it's process, and the rest is fine for the shell as long as it stays inside single or double quotes. grep the generated configure script if you're curious. Looks good, though. It's nice to keep all the version numbers in one spot. -- Dan _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
