Mercurial > mplayer.hg
comparison configure @ 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 | 754c22e6d43f |
children | 0ee3a65450b2 |
comparison
equal
deleted
inserted
replaced
31299:34507085a841 | 31300:f4e1cf6f1bdd |
---|---|
4787 vomodules="xvidix $vomodules" | 4787 vomodules="xvidix $vomodules" |
4788 else | 4788 else |
4789 novomodules="xvidix $novomodules" | 4789 novomodules="xvidix $novomodules" |
4790 fi | 4790 fi |
4791 | 4791 |
4792 echocheck "/dev/mga_vid" | |
4793 if test "$_mga" = auto ; then | |
4794 _mga=no | |
4795 test -c /dev/mga_vid && _mga=yes | |
4796 fi | |
4797 if test "$_mga" = yes ; then | |
4798 def_mga='#define CONFIG_MGA 1' | |
4799 vomodules="mga $vomodules" | |
4800 else | |
4801 def_mga='#undef CONFIG_MGA' | |
4802 novomodules="mga $novomodules" | |
4803 fi | |
4804 echores "$_mga" | |
4805 | |
4806 echocheck "xmga" | |
4807 if test "$_xmga" = auto ; then | |
4808 _xmga=no | |
4809 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes | |
4810 fi | |
4811 if test "$_xmga" = yes ; then | |
4812 def_xmga='#define CONFIG_XMGA 1' | |
4813 vomodules="xmga $vomodules" | |
4814 else | |
4815 def_xmga='#undef CONFIG_XMGA' | |
4816 novomodules="xmga $novomodules" | |
4817 fi | |
4818 echores "$_xmga" | |
4819 | |
4820 | 4792 |
4821 echocheck "GGI" | 4793 echocheck "GGI" |
4822 if test "$_ggi" = auto ; then | 4794 if test "$_ggi" = auto ; then |
4823 cat > $TMPC << EOF | 4795 cat > $TMPC << EOF |
4824 #include <ggi/ggi.h> | 4796 #include <ggi/ggi.h> |
7455 test "$_libswscale" = yes && def_libswscale='#define CONFIG_LIBSWSCALE 1' | 7427 test "$_libswscale" = yes && def_libswscale='#define CONFIG_LIBSWSCALE 1' |
7456 test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1' | 7428 test "$_libswscale_a" = yes && def_libswscale_a='#define CONFIG_LIBSWSCALE_A 1' |
7457 test "$_libswscale_so" = yes \ | 7429 test "$_libswscale_so" = yes \ |
7458 && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' | 7430 && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1' |
7459 echores "$_libswscale" | 7431 echores "$_libswscale" |
7432 | |
7433 echocheck "/dev/mga_vid" | |
7434 if test "$_mga" = auto ; then | |
7435 _mga=no | |
7436 test -c /dev/mga_vid && _mga=yes | |
7437 fi | |
7438 if test "$_mga" = yes ; then | |
7439 def_mga='#define CONFIG_MGA 1' | |
7440 vomodules="mga $vomodules" | |
7441 else | |
7442 def_mga='#undef CONFIG_MGA' | |
7443 novomodules="mga $novomodules" | |
7444 fi | |
7445 echores "$_mga" | |
7446 | |
7447 echocheck "xmga" | |
7448 if test "$_xmga" = auto ; then | |
7449 _xmga=no | |
7450 test "$_x11" = yes && test "$_mga" = yes && _xmga=yes | |
7451 fi | |
7452 if test "$_xmga" = yes ; then | |
7453 def_xmga='#define CONFIG_XMGA 1' | |
7454 vomodules="xmga $vomodules" | |
7455 else | |
7456 def_xmga='#undef CONFIG_XMGA' | |
7457 novomodules="xmga $novomodules" | |
7458 fi | |
7459 echores "$_xmga" | |
7460 | 7460 |
7461 echocheck "libopencore_amr narrowband" | 7461 echocheck "libopencore_amr narrowband" |
7462 if test "$_libopencore_amrnb" = auto ; then | 7462 if test "$_libopencore_amrnb" = auto ; then |
7463 _libopencore_amrnb=no | 7463 _libopencore_amrnb=no |
7464 cat > $TMPC << EOF | 7464 cat > $TMPC << EOF |