summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure8
1 files changed, 5 insertions, 3 deletions
diff --git a/configure b/configure
index e053de8f2a..f959ada9d1 100755
--- a/configure
+++ b/configure
@@ -735,7 +735,7 @@ _fribidi=auto
_enca=auto
_inet6=auto
_gethostbyname2=auto
-_ftp=yes
+_ftp=auto
_musepack=auto
_vstream=auto
_pthreads=auto
@@ -3101,7 +3101,6 @@ else
noinputmodules="networking $noinputmodules"
def_network='#undef CONFIG_NETWORK'
def_networking='#undef CONFIG_NETWORKING'
- _ftp=no
fi
echores "$networking"
@@ -7092,7 +7091,10 @@ echores "$_pvr"
echocheck "ftp"
-if ! beos && test "$_ftp" = yes ; then
+if test "$_ftp" = "auto" ; then
+test "$networking" = "yes" && ! beos && _ftp=yes
+fi
+if test "$_ftp" = yes ; then
def_ftp='#define CONFIG_FTP 1'
inputmodules="ftp $inputmodules"
else