aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMarvin Scholz <epirat07@gmail.com>2022-07-24 12:11:49 +0200
committerJan Ekström <jeebjp@gmail.com>2022-07-24 17:41:21 +0300
commit564d7946de56155d1c42165a8b561fcf5028cbbc (patch)
treec665219b1751701cbf72d9b417c1ec46732f8e9e /configure
parent8adbecc88e5d18e1a11a4b0bdfbae94c12640a01 (diff)
downloadffmpeg-564d7946de56155d1c42165a8b561fcf5028cbbc.tar.gz
configure: properly require libx264 if enabled
When libx264 can not be found even though it is enabled, it should error out properly instead of silently disabling it.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 46f6490a64..6629d14099 100755
--- a/configure
+++ b/configure
@@ -6673,7 +6673,7 @@ enabled libvpx && {
enabled libwebp && {
enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
-enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
+enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && {
[ "$toolchain" != "msvc" ] ||
require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&