[cairo] patch for autogen

[Bryce Harrington]

On Tue, 12 Oct 2004, Carl Worth wrote:
> On Mon, 16 Aug 2004 16:19:03 -0700 (PDT), Bryce Harrington wrote:
> > I ran into kind of an oddball problem configuring cairo on my gentoo
> > system.  When I ran ./autogen.sh for cairo it indicated that my autoconf
> > and automake versions were too old, however:
>
> Bryce,
>
> Thanks for reporting this problem.
>
> Sounds like more false negatives in the version checks to me, but I'm
> not sure since I don't know exactly which versions we actually require.

Ah, I had assumed those were in there for a reason.  The changes in the
patch were based off of autoconf stuff from how other packages have
handled it.

> > diff -u -p -u -r1.58 configure.in
> > --- configure.in        21 Jun 2004 22:13:52 -0000      1.58
> > +++ configure.in        16 Aug 2004 23:15:03 -0000
> > @@ -1,3 +1,5 @@
> > +
> > +AC_PREREQ(2.50)
> >  AC_INIT(src/cairo.h)
>
> That much seems quite reasonable. If we do need this version (or
> greater) of autoconf, then I would greatly prefer to use a supported
> means of declaring that rather than rolling our own version check in the
> bootstrapper.
>
> > +# Use automake-1.7 if available.  Some automake installations will try to
> > +# provide an earlier version of automake if run without specifying
> > +if (automake-1.7 --version) < /dev/null > /dev/null 2>&1 ; then
> > +    AUTOMAKE=automake-1.7
> > +    ACLOCAL=aclocal-1.7
> > +fi
>
> I don't like that at all, since it looks for a specific version rather
> than a >= relationship. The right fix here might be to just eliminate
> the check in autogen.sh on the version of automake. (See my other recent
> post on this subject.)

Yeah, me neither, but I ran across this style of code in a few packages.
If you can eliminate the checks altogether, that would be an easier to
maintain solution.

Bryce