[FFmpeg-cvslog] r24024 - trunk/configure

Stefano Sabatini stefano.sabatini-lala
Sat Jul 3 21:04:43 CEST 2010


On date Saturday 2010-07-03 15:52:48 -0300, Ramiro Polla wrote:
> On Sat, Jul 3, 2010 at 3:25 PM, stefano <subversion at mplayerhq.hu> wrote:
> > Author: stefano
> > Date: Sat Jul ?3 20:25:40 2010
> > New Revision: 24024
> >
> > Log:
> > Add function check for librtmp, require RTMP_Socket() which was added
> > in version 2.2.f.
> >
> > Avoid a compile-time failure.
> >
> > Modified:
> > ? trunk/configure
> >
> > Modified: trunk/configure
> > ==============================================================================
> > --- trunk/configure ? ? Sat Jul ?3 20:19:38 2010 ? ? ? ?(r24023)
> > +++ trunk/configure ? ? Sat Jul ?3 20:25:40 2010 ? ? ? ?(r24024)
> > @@ -2549,7 +2549,8 @@ enabled libnut ? ? && require ?libnut li
> > ?enabled libopencore_amrnb ?&& require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
> > ?enabled libopencore_amrwb ?&& require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
> > ?enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
> > -enabled librtmp ? ?&& require ?librtmp librtmp/rtmp.h RTMP_Init $(pkg-config --libs librtmp)
> > +enabled librtmp ? ?&& check_lib librtmp/rtmp.h RTMP_Socket $(pkg-config --libs librtmp) ||
> > + ? ? ? ? ? ? ? ? ? ? ? ?die "ERROR: librtmp not found or RTMP_Socket() missing, librtmp version must be >= 2.2.f"
> > ?enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
> > ? ? ? ? ? ? ? ? ? ? ? ? ? ?require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0)
> > ?enabled libspeex ? && require ?libspeex speex/speex.h speex_decoder_init -lspeex
> 
> This would fail if librtmp was not enabled and not present. I
> committed a fix which I believe to be correct to restore a working
> configure. I may have also misused the term "brackets" on my commit
> log (I always forget which one is [] and {} and <>...). Please flame
> my commit in -cvslog if I did anything wrong.

Doh!, I repeated the same error again, thanks for the fix.



More information about the ffmpeg-cvslog mailing list