[FFmpeg-devel] [PATCH] Other configure version check patches

[Måns Rullgård]

Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:

> On date Saturday 2008-10-18 22:50:37 +0200, Diego Biurrun encoded:
>> On Sat, Oct 18, 2008 at 08:51:01PM +0100, M?ns Rullg?rd wrote:
>> > Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
>> > 
>> > > MinGW patche by Ramiro, this patch also suggest a better way to convey
>> > > the meaning of the check to the user, so I think that
>> > > require_cpp_condition() may be safely removed.
>> > >
>> > > --- configure	(revision 15634)
>> > > +++ configure	(working copy)
>> > > @@ -1736,7 +1736,7 @@
>> > >  enabled libx264    && require  x264 x264.h x264_encoder_open -lx264 -lm \
>> > > -                   && require_cpp_condition x264 x264.h "X264_BUILD >= 65"
>> > > +                   && { check_cpp_condition x264.h "X264_BUILD >= 65" || die "libx264 version must be >= 0.65."; }
>> > 
>> > Are those { } really needed?  It seems to me it should work fine
>> > without (and that's how I would probably have done it in the first
>> > place).
>> 
>> I wondered the same thing.
>
> You're right. New patch attached.
>
> [...]
>
> Regards.
> -- 
> FFmpeg = Fostering and Fiendish Meaningless Proud Exploitable Gorilla
>
> Index: configure
> ===================================================================
> --- configure	(revision 15638)
> +++ configure	(working copy)
> @@ -1736,7 +1736,7 @@
>  enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
>  enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
>  enabled libx264    && require  x264 x264.h x264_encoder_open -lx264 -lm &&
> -                      require_cpp_condition x264 x264.h "X264_BUILD >= 65"
> +                      check_cpp_condition x264.h "X264_BUILD >= 65" || die "ERROR: libx264 version must be >= 0.65."

Break the line after ||

-- 
M?ns Rullg?rd
mans at mansr.com