Mercurial > mplayer.hg
changeset 31300:f4e1cf6f1bdd
move the mga video check below the libswscale check
Acked by diego in <20100610140017.GB4820@pool.informatik.RWTH-Aachen.DE>
| author | siretart |
|---|---|
| date | Fri, 11 Jun 2010 10:25:21 +0000 |
| parents | 34507085a841 |
| children | f378c41da83d |
| files | configure |
| diffstat | 1 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Jun 10 21:58:03 2010 +0000 +++ b/configure Fri Jun 11 10:25:21 2010 +0000 @@ -4789,34 +4789,6 @@ novomodules="xvidix $novomodules" fi -echocheck "/dev/mga_vid" -if test "$_mga" = auto ; then - _mga=no - test -c /dev/mga_vid && _mga=yes -fi -if test "$_mga" = yes ; then - def_mga='#define CONFIG_MGA 1' - vomodules="mga $vomodules" -else - def_mga='#undef CONFIG_MGA' - novomodules="mga $novomodules" -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 "GGI" if test "$_ggi" = auto ; then @@ -7458,6 +7430,34 @@ && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' echores "$_libswscale" +echocheck "/dev/mga_vid" +if test "$_mga" = auto ; then + _mga=no + test -c /dev/mga_vid && _mga=yes +fi +if test "$_mga" = yes ; then + def_mga='#define CONFIG_MGA 1' + vomodules="mga $vomodules" +else + def_mga='#undef CONFIG_MGA' + novomodules="mga $novomodules" +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 "libopencore_amr narrowband" if test "$_libopencore_amrnb" = auto ; then _libopencore_amrnb=no