Mercurial > mplayer.hg
changeset 18387:67a41ab8e9ed
x264 linking now requires explicit x11 libraries inclusion.
As side effect this fix simplifies the complicated expression.
| author | iive |
|---|---|
| date | Thu, 04 May 2006 19:10:16 +0000 |
| parents | e68027956822 |
| children | afcecc96ed2d |
| files | configure |
| diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu May 04 16:34:05 2006 +0000 +++ b/configure Thu May 04 19:10:16 2006 +0000 @@ -6452,10 +6452,17 @@ 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"