[SCM] libav/experimental: configure: enclose library check for librtmp in brackets otherwise it would always fail if librtmp was not enabled.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:10:16 UTC 2013


The following commit has been merged in the experimental branch:
commit 42ebfc54b839a687f803b0353cfc64cfd492cba1
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Sat Jul 3 18:50:40 2010 +0000

    configure: enclose library check for librtmp in brackets
    otherwise it would always fail if librtmp was not enabled.
    
    Originally committed as revision 24026 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index e4f99cf..dceb4b5 100755
--- a/configure
+++ b/configure
@@ -2549,8 +2549,8 @@ enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
 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    && 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 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list