[FFmpeg-cvslog] configure: use pkg-config to detect libbluray
Timothy Gu
git at videolan.org
Tue Apr 22 00:59:46 CEST 2014
ffmpeg | branch: release/1.1 | Timothy Gu <timothygu99 at gmail.com> | Sun Feb 23 16:39:18 2014 -0800| [6294d84dca46c1d8cb44c00369a85c5618c00a2d] | committer: Michael Niedermayer
configure: use pkg-config to detect libbluray
The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03)
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Conflicts:
configure
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6294d84dca46c1d8cb44c00369a85c5618c00a2d
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 9c01958..96703ec 100755
--- a/configure
+++ b/configure
@@ -3864,7 +3864,7 @@ enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_in
enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
enabled libass && require_pkg_config libass ass/ass.h ass_library_init
-enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray
+enabled libbluray && require_pkg_config libbluray libbluray/bluray.h bd_open
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."; }
More information about the ffmpeg-cvslog
mailing list