diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-09-21 22:26:44 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:07 +0200 |
commit | 4c904953b5c9250d814092591a8396165bc9b5c5 (patch) | |
tree | 38830b57c4036a7610ccf93dc4b2e6bcede13af4 | |
parent | 6939bd8c9c9dcc54edcc7a8c0818daa2c7cb0c5b (diff) | |
download | mpv-4c904953b5c9250d814092591a8396165bc9b5c5.tar.bz2 mpv-4c904953b5c9250d814092591a8396165bc9b5c5.tar.xz |
configure: Move network requirement check for FTP into the FTP test
This makes the FTP test self-sufficient and reduces complexity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32340 b3059339-0415-0410-9bf9-f77b7e298cf2
Add proper autodetection for FTP support; should fix Bugzilla #1804.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32377 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 |