RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

x264 linking now requires explicit x11 libraries inclusion. 

As side effect this fix simplifies the complicated expression.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18388 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
iive 2006-05-04 19:10:16 +00:00
parent 4ea78566ce
commit 551166192f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -6452,10 +6452,17 @@ cat > $TMPC << EOF
int main(void) { x264_encoder_open((void*)0); return 0; }
EOF
_ld_x264="$_ld_x264 -lx264 $_ld_pthread"
if test "$_x264" != no && \
( cc_check $_inc_x264 $_ld_x264 $_ld_lm || \
( test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm )) ; \
then
if test "$_x264" != no ; then
_x264=no
if cc_check $_inc_x264 $_ld_x264 $_ld_lm ; then
_x264=yes
elif test "$_x11" = yes && cc_check $_inc_x264 $_inc_x11 $_ld_x264 $_ld_x11 $_ld_lm ; then
_x264=yes
_ld_x264="$_ld_x264 $_ld_x11"
fi
fi
if test "$_x264" = yes ; then
_x264=yes
_def_x264='#define HAVE_X264 1'
_codecmodules="x264 $_codecmodules"