Mercurial > mplayer.hg

changeset 32291:7a7456aea7d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add proper autodetection for FTP support; should fix Bugzilla #1804.
author diego
date Sun, 26 Sep 2010 22:06:33 +0000
parents 33d9f6230dff
children 02c4e1a2298b
files configure
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Sep 26 21:51:39 2010 +0000
+++ b/configure	Sun Sep 26 22:06:33 2010 +0000
@@ -781,7 +781,7 @@
 _enca=auto
 _inet6=auto
 _gethostbyname2=auto
-_ftp=yes
+_ftp=auto
 _musepack=auto
 _vstream=auto
 _pthreads=auto
@@ -7617,7 +7617,10 @@
 
 
 echocheck "ftp"
-if ! beos && test "$networking" = yes && 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