Mercurial > mplayer.hg

changeset 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
files configure
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Sep 21 21:13:21 2010 +0000
+++ b/configure	Tue Sep 21 22:26:44 2010 +0000
@@ -3344,7 +3344,6 @@
   noinputmodules="networking $noinputmodules"
   def_network='#undef CONFIG_NETWORK'
   def_networking='#undef CONFIG_NETWORKING'
-  _ftp=no
   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//)
   libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//)
 fi
@@ -7674,7 +7673,7 @@
 
 
 echocheck "ftp"
-if ! beos && test "$_ftp" = yes ; then
+if ! beos && test "$networking" = yes && test "$_ftp" = yes ; then
   def_ftp='#define CONFIG_FTP 1'
   inputmodules="ftp $inputmodules"
 else