[FFmpeg-cvslog] r22913 - trunk/configure
darkshikari
subversion
Mon Apr 19 21:34:38 CEST 2010
Author: darkshikari
Date: Mon Apr 19 21:34:37 2010
New Revision: 22913
Log:
Fix libx264 configure check to use pkg-config if available.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Mon Apr 19 15:05:26 2010 (r22912)
+++ trunk/configure Mon Apr 19 21:34:37 2010 (r22913)
@@ -2612,7 +2612,7 @@ enabled libschroedinger && add_cflags $(
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
More information about the ffmpeg-cvslog
mailing list