aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2014-10-17 16:35:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-18 02:36:25 +0200
commite06263ef1e0e172b2c76070b3dc739411af08e82 (patch)
tree15197e9e4c5e35aa35bebe9c27844e499bfc524a /configure
parent0eabbe2101f1cd54ff961ebbff7b3f9ffb599208 (diff)
downloadffmpeg-e06263ef1e0e172b2c76070b3dc739411af08e82.tar.gz
configure: add pkg-config support for libx264
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 3e7143c6d6..5b16af9bc5 100755
--- a/configure
+++ b/configure
@@ -4880,7 +4880,10 @@ enabled libvpx && {
enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || disable libvpx_vp9_encoder; } }
enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack
enabled libwebp && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
-enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 &&
+enabled libx264 && { { check_pkg_config x264 "stdint.h x264.h" x264_encoder_encode &&
+ require_pkg_config x264 "stdint.h x264.h" x264_encoder_encode; } ||
+ { require libx264 x264.h x264_encoder_encode -lx264 &&
+ warn "using libx264 without pkg-config"; } } &&
{ check_cpp_condition x264.h "X264_BUILD >= 118" ||
die "ERROR: libx264 must be installed and version must be >= 0.118."; }
enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode &&