From af964baf090616fbd858e8937d95bf1f1d8be277 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 11 Jan 2018 11:12:38 +0100 Subject: [PATCH] configure: Simplify detection of static x264 on systems without pkg-config. Fixes a regression since 6dfcbd80. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 84d20538d9..5d533621ae 100755 --- a/configure +++ b/configure @@ -5939,7 +5939,7 @@ 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 || - { require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 && + { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs" && warn "using libx264 without pkg-config"; } } && require_cpp_condition x264.h "X264_BUILD >= 118" && { check_cpp_condition x264.h "X264_MPEG2" &&