Mercurial > mplayer.hg
changeset 19450:185942a2f517
Fix xv and xinerama force on --enable-*
The previous commit changed the conditions of check execution to match Diego's semantics
(execute check only on 'auto'), but the 'else' case forces detection to 'no',
even if previous --enable-* had set it to 'yes'.
author | iive |
---|---|
date | Sat, 19 Aug 2006 19:10:27 +0000 |
parents | c2c0e241e86f |
children | 0ceeedf7f04d |
files | configure |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Aug 19 14:53:43 2006 +0000 +++ b/configure Sat Aug 19 19:10:27 2006 +0000 @@ -3825,15 +3825,15 @@ EOF _xv=no cc_check -lXv $_ld_x11 && _xv=yes -else - _xv=no -fi +fi + if test "$_xv" = yes ; then _def_xv='#define HAVE_XV 1' _ld_xv='-lXv' _vosrc="$_vosrc vo_xv.c" _vomodules="xv $_vomodules" else + _xv=no _def_xv='#undef HAVE_XV' _novomodules="xv $_novomodules" fi @@ -3878,13 +3878,13 @@ EOF _xinerama=no cc_check -lXinerama $_ld_x11 && _xinerama=yes -else - _xinerama=no -fi +fi + if test "$_xinerama" = yes ; then _def_xinerama='#define HAVE_XINERAMA 1' _ld_xinerama='-lXinerama' else + _xinerama=no _def_xinerama='#undef HAVE_XINERAMA' fi echores "$_xinerama"