# HG changeset patch
# User diego
# Date 1285108004 0
# Node ID 9eda56c9fac14cf77669e6a58db9f76f87392cc0
# Parent  377d9474b5247284dc58ae7cbbd8bf2470ef101c
Move network requirement check for FTP into the FTP test.
This makes the FTP test self-sufficient and reduces complexity.

diff -r 377d9474b524 -r 9eda56c9fac1 configure
--- 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