[FFmpeg-cvslog] configure: Simplify detection of static x264 on systems without pkg-config.

Carl Eugen Hoyos git at videolan.org
Thu Jan 11 12:14:11 EET 2018


ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Thu Jan 11 11:12:38 2018 +0100| [af964baf090616fbd858e8937d95bf1f1d8be277] | committer: Carl Eugen Hoyos

configure: Simplify detection of static x264 on systems without pkg-config.

Fixes a regression since 6dfcbd80.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af964baf090616fbd858e8937d95bf1f1d8be277
---

 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" &&



More information about the ffmpeg-cvslog mailing list