aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-02-23 16:39:18 -0800
committerMichael Niedermayer <michaelni@gmx.at>2014-02-27 00:33:00 +0100
commit612ef09a1819da800865372df25378efffcf9acf (patch)
tree0daeb2a481c689754c2b686b4671a6508822cb8c
parentf0ee0fcbfcb5b42f57cd6b629c0cbba1a9160ee6 (diff)
downloadffmpeg-612ef09a1819da800865372df25378efffcf9acf.tar.gz
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@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit baa650cc7946a9eb1cf5a083f61a581a97122f03) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 47865b62ad..43b4937775 100755
--- a/configure
+++ b/configure
@@ -4136,7 +4136,7 @@ enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h gnutls_gl
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."; }