Mercurial > mplayer.hg
changeset 32286:62828818e3d4
Move xmga check after X11, which xmga requires.
author | diego |
---|---|
date | Sun, 26 Sep 2010 20:51:30 +0000 |
parents | 150de764e80b |
children | a27f96e11216 |
files | configure |
diffstat | 1 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Sep 26 20:48:15 2010 +0000 +++ b/configure Sun Sep 26 20:51:30 2010 +0000 @@ -4108,20 +4108,6 @@ fi echores "$_mga" -echocheck "xmga" -if test "$_xmga" = auto ; then - _xmga=no - test "$_x11" = yes && test "$_mga" = yes && _xmga=yes -fi -if test "$_xmga" = yes ; then - def_xmga='#define CONFIG_XMGA 1' - vomodules="xmga $vomodules" -else - def_xmga='#undef CONFIG_XMGA' - novomodules="xmga $novomodules" -fi -echores "$_xmga" - echocheck "tdfxfb" if test "$_tdfxfb" = yes ; then @@ -4555,6 +4541,21 @@ echores "$_dga" +echocheck "xmga" +if test "$_xmga" = auto ; then + _xmga=no + test "$_x11" = yes && test "$_mga" = yes && _xmga=yes +fi +if test "$_xmga" = yes ; then + def_xmga='#define CONFIG_XMGA 1' + vomodules="xmga $vomodules" +else + def_xmga='#undef CONFIG_XMGA' + novomodules="xmga $novomodules" +fi +echores "$_xmga" + + echocheck "3dfx" if test "$_3dfx" = yes && test "$_dga" = yes ; then def_3dfx='#define CONFIG_3DFX 1'