Fix libx264 configure check to use pkg-config if available.

Originally committed as revision 22913 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago · 73f3f30de5
parent 1840b28059
commit 73f3f30de5
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -2612,7 +2612,7 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
 enabled libtheora  && require  libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libx264    && require  libx264 x264.h x264_encoder_encode -lx264 -lm &&
+enabled libx264    && require  libx264 x264.h x264_encoder_encode $(pkg-config --libs x264 2> /dev/null) -lx264 -lm &&
                      { check_cpp_condition x264.h "X264_BUILD >= 83" ||
                        die "ERROR: libx264 version must be >= 0.83."; }
 enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore