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

[Måns Rullgård]

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

> On date Sunday 2008-10-19 00:32:15 +0100, M?ns Rullg?rd encoded:
>> Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
> [...]
>> > 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 ||
>
> If this is OK I'll apply also the patch which removes
> require_cpp_condition.
>
> Index: configure
> ===================================================================
> --- configure	(revision 15638)
> +++ configure	(working copy)
> @@ -1736,7 +1736,8 @@
>  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."
>  enabled libxvid    && require  Xvid xvid.h xvid_global -lxvidcore
>  enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib

OK.  Please apply this and the require_cpp_condition removal separately.

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