Mercurial > mplayer.hg

changeset 7429:7a221aaf7012

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable the LIVE lib only if the network layer (STREAMING) is enable. Fixed the bug where if streaming disable and live enable, the live config test will reenable the network layer.
author bertrand
date Tue, 17 Sep 2002 19:47:55 +0000
parents 29cce5d75dca
children 4304d0980a62
files configure
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Sep 17 16:11:50 2002 +0000
+++ b/configure	Tue Sep 17 19:47:55 2002 +0000
@@ -3598,16 +3598,15 @@
 fi
 
 echocheck "LIVE.COM Streaming Media libraries"
-if test "$_live" = auto ; then
+if test "$_live" = auto  && test "$_streaming" = yes ; then
   _live=yes
   test "$_livelibdir" || _live=no
   # TODO: deeper, more reliable test of libs, and version!
   # (users may have empty live/ dir or something different there, for
   # example 'live config files', or they may have old, incompatibel version)
 fi
-if test "$_live" = yes ; then
+if test "$_live" = yes && test "$_streaming" = yes ; then
   echores "yes (using $_livelibdir)"
-  _streaming=yes
   _def_live='#define STREAMING_LIVE_DOT_COM 1'
   _live_libs_def="# LIVE.COM Streaming Media libraries:
 LIVE_LIB_DIR = $_livelibdir