[PATCH] configure.ac: move all protocol requirements to a single location.

[Peter Hutterer]

On Tue, Sep 15, 2009 at 09:41:11AM +0200, Julien Cristau wrote:
> On Tue, Sep 15, 2009 at 15:28:35 +1000, Peter Hutterer 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.
> 
> Looks good.  A couple comments below.
> 
> > 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]"
> 
> any reason this one doesn't follow the same naming rule?

search/replace fail, thanks.

> 
> > +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]"
> > +
> >  dnl Core modules for most extensions, et al.
> > -REQUIRED_MODULES="[randrproto >= 1.2.99.3] [renderproto >= 0.11] [fixesproto >= 4.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 7.0.99.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] resourceproto fontsproto [inputproto >= 1.9.99.902] [kbproto >= 1.0.3]"
> > +REQUIRED_MODULES="[randrproto >= 1.2.99.3] "    \
> > +                 "[renderproto >= 0.11] "       \
> > +                 "[damageproto >= 1.1] "        \
> > +                 "[xcmiscproto >= 1.2.0] "      \
> > +                 "[xextproto >= 7.0.99.3] "     \
> > +                 "[xproto >= 7.0.13] "          \
> > +                 "[xtrans >= 1.2.2] "           \
> > +                 "[bigreqsproto >= 1.1.0] "     \
> > +                 "resourceproto "               \
> > +                 "fontsproto "                  \
> > +                 "[inputproto >= 1.9.99.902] "  \
> > +                 "[kbproto >= 1.0.3] "          \
> > +                 "$FIXESPROTO "
> 
> if fixesproto is not optional, why list it above rather than here?

fixesproto is the only one that is separately listed (for Darwin, around
line 1723). In hindsight, that seems superfluous since REQUIRED_MODULES is
always checked for. Jeremy, any comments?

Cheers,
  Peter