github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-08-04 14:59:58 +02:00
Code Releases Activity

Move network detection further up to simplify detection of dependant stuff.

Browse Source 
Blessed by Diego (see [MPlayer-cygwin] Current issues).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22077 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-01-30 18:29:02 +00:00
parent 54ef26f173
commit 916f3055cf
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure vendored
View File

@ -2841,6 +2841,18 @@ if test "$_use_aton" = yes; then
_def_use_aton='#define USE_ATON 1'
fi
echocheck "network"
# FIXME network check
if test "$_network" = yes ; then
_def_network='#define MPLAYER_NETWORK 1'
_ld_extra="$_ld_extra $_ld_sock"
_inputmodules="network $_inputmodules"
else
_noinputmodules="network $_noinputmodules"
_def_network='#undef MPLAYER_NETWORK'
_ftp=no
fi
echores "$_network"
echocheck "inttypes.h (required)"
cat > $TMPC << EOF
@ -3891,9 +3903,9 @@ EOF
for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \
-L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do
if netbsd; then
_ld_tmp="$I -lXext -lX11 $_ld_sock $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`"
_ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`"
else
_ld_tmp="$I -lXext -lX11 $_ld_sock $_ld_pthread"
_ld_tmp="$I -lXext -lX11 $_ld_pthread"
fi
cc_check $_inc_x11 $_ld_tmp && _libs_mplayer="$_libs_mplayer $_ld_tmp" \
&& _x11=yes && break
@ -6866,19 +6878,6 @@ fi
echores "$_select"
echocheck "network"
# FIXME network check
if test "$_network" = yes ; then
_def_network='#define MPLAYER_NETWORK 1'
_ld_extra="$_ld_extra $_ld_sock"
_inputmodules="network $_inputmodules"
else
_noinputmodules="network $_noinputmodules"
_def_network='#undef MPLAYER_NETWORK'
_ftp=no
fi
echores "$_network"
echocheck "ftp"
if not beos && test "$_ftp" = yes ; then
_def_ftp='#define HAVE_FTP 1'