[FFmpeg-cvslog] configure: add pkg-config support for libdcadec

Simon Thelen git at videolan.org
Thu Apr 16 14:58:53 CEST 2015


ffmpeg | branch: master | Simon Thelen <ffmpeg-dev at c-14.de> | Wed Apr 15 17:18:58 2015 +0200| [ed2a712750c3342e399a44f9c5c2bd278128c759] | committer: Michael Niedermayer

configure: add pkg-config support for libdcadec

Signed-off-by: Simon Thelen <ffmpeg-dev at c-14.de>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed2a712750c3342e399a44f9c5c2bd278128c759
---

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 389de92..1d98828 100755
--- a/configure
+++ b/configure
@@ -5012,7 +5012,8 @@ enabled libcelt           && require libcelt celt/celt.h celt_decode -lcelt0 &&
                              { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
                                die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
 enabled libcaca           && require_pkg_config caca caca.h caca_create_canvas
-enabled libdcadec         && require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec
+enabled libdcadec         && { use_pkg_config dcadec libdcadec/dca_context.h dcadec_context_create ||
+                               { require libdcadec libdcadec/dca_context.h dcadec_context_create -ldcadec; }; }
 enabled libfaac           && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libfdk_aac        && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
 flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"



More information about the ffmpeg-cvslog mailing list