Mercurial > mplayer.hg

comparison configure @ 32256:9eda56c9fac1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move network requirement check for FTP into the FTP test. This makes the FTP test self-sufficient and reduces complexity.
author diego
date Tue, 21 Sep 2010 22:26:44 +0000
parents 377d9474b524
children 5636dcc06921
comparison
equal deleted inserted replaced
32255:377d9474b524 32256:9eda56c9fac1
3342 inputmodules="networking $inputmodules" 3342 inputmodules="networking $inputmodules"
3343 else 3343 else
3344 noinputmodules="networking $noinputmodules" 3344 noinputmodules="networking $noinputmodules"
3345 def_network='#undef CONFIG_NETWORK' 3345 def_network='#undef CONFIG_NETWORK'
3346 def_networking='#undef CONFIG_NETWORKING' 3346 def_networking='#undef CONFIG_NETWORKING'
3347 _ftp=no
3348 libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL// -e s/MMSH_PROTOCOL// -e s/MMST_PROTOCOL//) 3347 libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL// -e s/MMSH_PROTOCOL// -e s/MMST_PROTOCOL//)
3349 libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) 3348 libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//)
3350 fi 3349 fi
3351 echores "$networking" 3350 echores "$networking"
3352 3351
7672 fi 7671 fi
7673 echores "$_pvr" 7672 echores "$_pvr"
7674 7673
7675 7674
7676 echocheck "ftp" 7675 echocheck "ftp"
7677 if ! beos && test "$_ftp" = yes ; then 7676 if ! beos && test "$networking" = yes && test "$_ftp" = yes ; then
7678 def_ftp='#define CONFIG_FTP 1' 7677 def_ftp='#define CONFIG_FTP 1'
7679 inputmodules="ftp $inputmodules" 7678 inputmodules="ftp $inputmodules"
7680 else 7679 else
7681 noinputmodules="ftp $noinputmodules" 7680 noinputmodules="ftp $noinputmodules"
7682 def_ftp='#undef CONFIG_FTP' 7681 def_ftp='#undef CONFIG_FTP'