Mercurial > mplayer.hg
changeset 23316:9446edf3329f
Move the internal VIDIX check from a random place into the VIDIX section.
| author | diego |
|---|---|
| date | Thu, 17 May 2007 21:33:49 +0000 |
| parents | 39c0107471df |
| children | f5ecd91bcea1 |
| files | configure |
| diffstat | 1 files changed, 34 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu May 17 21:19:18 2007 +0000 +++ b/configure Thu May 17 21:33:49 2007 +0000 @@ -2509,41 +2509,6 @@ fi fi -if test "$_vidix_internal" = auto ; then - _vidix_internal=no - # should check for x86 systems supporting VIDIX (does QNX have VIDIX?) - x86 && _vidix_internal=yes -# this is broken currently, undefined references to inw, outw etc. -# ppc && linux && _vidix_internal=yes - alpha && linux && _vidix_internal=yes - qnx && _vidix_internal=no - beos && _vidix_internal=no - darwin && _vidix_internal=no -fi - - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk -if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi - ###################### # MAIN TESTS GO HERE # ###################### @@ -7203,6 +7168,40 @@ # TODO cleanup the VIDIX stuff here echocheck "VIDIX" +if test "$_vidix_internal" = auto ; then + _vidix_internal=no + # should check for x86 systems supporting VIDIX (does QNX have VIDIX?) + x86 && _vidix_internal=yes +# this is broken currently, undefined references to inw, outw etc. +# ppc && linux && _vidix_internal=yes + alpha && linux && _vidix_internal=yes + qnx && _vidix_internal=no + beos && _vidix_internal=no + darwin && _vidix_internal=no +fi + +# checking for a working awk, I'm using mawk first, because it's fastest - atmos +_awk=awk +if test "$_vidix_internal" = yes ; then +_awk_verc_fail=yes +echocheck "awk" +for _awk in mawk gawk nawk; do + if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then + _awk_verc_fail=no + break + fi +done +test "$_awk_verc_fail" = yes && _awk=no +echores "$_awk" +if test "$_awk_verc_fail" = yes; then +echo "VIDIX needs awk, but no working implementation was found!" +echo "Try the GNU version, which can be downloaded from:" +echo "ftp://ftp.gnu.org/gnu/gawk/" +echo "If you don't need VIDIX, you can use configure --disable-vidix instead." +die "no awk" +fi +fi + if test "$_vidix_internal" = yes; then _res_comment="internal" _vidix_external=no