[FFmpeg-cvslog] r24742 - trunk/configure

[Ramiro Polla]

On Sat, Aug 7, 2010 at 9:06 PM, diego <subversion at mplayerhq.hu> wrote:
> Author: diego
> Date: Sun Aug ?8 02:06:24 2010
> New Revision: 24742
>
> Log:
> Split libvpx check into decoder and encoder check.
> This allows using a libvpx that has been configured as decoder/encoder only.
> patch by Frank Barchard, fbarchard google com
>
> Modified:
> ? trunk/configure
>
> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure ? ? Sun Aug ?8 01:10:25 2010 ? ? ? ?(r24741)
> +++ trunk/configure ? ? Sun Aug ?8 02:06:24 2010 ? ? ? ?(r24742)
> @@ -2697,9 +2697,10 @@ enabled libschroedinger && add_cflags $(
> ?enabled libspeex ? && require ?libspeex speex/speex.h speex_decoder_init -lspeex
> ?enabled libtheora ?&& require ?libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
> ?enabled libvorbis ?&& require ?libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
> -enabled libvpx ? ? && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx &&
> - ? ? ? ? ? ? ? ? ? ? ? ?check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_enc_init_ver -lvpx ||
> - ? ? ? ? ? ? ? ? ? ? ?die "ERROR: libvpx version must be >=0.9.1"; }
> +enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?die "ERROR: libvpx decoder version must be >=0.9.1"; }
> +enabled libvpx_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_enc_init_ver -lvpx ||
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ?die "ERROR: libvpx encoder version must be >=0.9.1"; }
> ?enabled libx264 ? ?&& require ?libx264 x264.h x264_encoder_encode -lx264 &&
> ? ? ? ? ? ? ? ? ? ? ? { check_cpp_condition x264.h "X264_BUILD >= 98" ||
> ? ? ? ? ? ? ? ? ? ? ? ? die "ERROR: libx264 version must be >= 0.98."; }

This broke configure when libvpx is not installed on the system (even
if it has not been enabled in configure). I committed a fix to restore
a working configure. Sorry if it's not ideal functionality- or
cosmetic-wise.

BTW, Mans, FATE just silently clears the entry in the index page when
configure fails. Is that expected behavior?