diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-04 19:10:16 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-04 19:10:16 +0000 |
| commit | 551166192fd5e1e9a845391834aeb0003c8e315f (patch) | |
| tree | d5e413aaa51d8ce97bc6e93507bceff3c43397f7 /configure | |
| parent | 4ea78566ce7fb06b5523341b76d3dd81f643f0ed (diff) | |
| download | mpv-551166192fd5e1e9a845391834aeb0003c8e315f.tar.bz2 mpv-551166192fd5e1e9a845391834aeb0003c8e315f.tar.xz | |
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -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" |