summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-17 19:47:55 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-17 19:47:55 +0000
commit27506924c4f20e795bc466f6da51121b6a1d834e (patch)
tree8359609f33e82c89be7862838eafe89feb98d93e
parentec333b5d5f3cedcc722b90fce304adb77b024562 (diff)
downloadmpv-27506924c4f20e795bc466f6da51121b6a1d834e.tar.bz2
mpv-27506924c4f20e795bc466f6da51121b6a1d834e.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7430 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index 7253775b2d..8905593f09 100755
--- a/configure
+++ b/configure
@@ -3598,16 +3598,15 @@ if test -z "$_livelibdir" ; then
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