mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
6939bd8c9c
commit
4c904953b5
|
@ -735,7 +735,7 @@ _fribidi=auto
|
||||||
_enca=auto
|
_enca=auto
|
||||||
_inet6=auto
|
_inet6=auto
|
||||||
_gethostbyname2=auto
|
_gethostbyname2=auto
|
||||||
_ftp=yes
|
_ftp=auto
|
||||||
_musepack=auto
|
_musepack=auto
|
||||||
_vstream=auto
|
_vstream=auto
|
||||||
_pthreads=auto
|
_pthreads=auto
|
||||||
|
@ -3101,7 +3101,6 @@ else
|
||||||
noinputmodules="networking $noinputmodules"
|
noinputmodules="networking $noinputmodules"
|
||||||
def_network='#undef CONFIG_NETWORK'
|
def_network='#undef CONFIG_NETWORK'
|
||||||
def_networking='#undef CONFIG_NETWORKING'
|
def_networking='#undef CONFIG_NETWORKING'
|
||||||
_ftp=no
|
|
||||||
fi
|
fi
|
||||||
echores "$networking"
|
echores "$networking"
|
||||||
|
|
||||||
|
@ -7092,7 +7091,10 @@ echores "$_pvr"
|
||||||
|
|
||||||
|
|
||||||
echocheck "ftp"
|
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'
|
def_ftp='#define CONFIG_FTP 1'
|
||||||
inputmodules="ftp $inputmodules"
|
inputmodules="ftp $inputmodules"
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue