Mercurial > mplayer.hg
changeset 22059:de1f96b96144
Move network detection further up to simplify detection of dependant stuff.
Blessed by Diego (see [MPlayer-cygwin] Current issues).
| author | reimar |
|---|---|
| date | Tue, 30 Jan 2007 18:29:02 +0000 |
| parents | b149aa896f8d |
| children | 72cda37eb94c |
| files | configure |
| diffstat | 1 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Tue Jan 30 16:16:10 2007 +0000 +++ b/configure Tue Jan 30 18:29:02 2007 +0000 @@ -2841,6 +2841,18 @@ _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 @@ 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 @@ 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'