Mercurial > mplayer.hg

changeset 24573:6815406607cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix building without network. When _network=='no' then _nemesi, _live and _native_rtsp would keep their default values, in the the case of _native_rtsp this happens to be 'yes'. Clearing them also produces nicer output.
author iive
date Sat, 22 Sep 2007 16:14:20 +0000
parents 6c914242277b
children f89d135bcae0
files configure
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Sep 22 13:31:56 2007 +0000
+++ b/configure	Sat Sep 22 16:14:20 2007 +0000
@@ -6235,16 +6235,17 @@
         _nemesi=yes
     fi
 fi
-echores "$_nemesi"
-
 if test "$_nemesi" = yes; then
     _native_rtsp=no
     _def_nemesi='#define LIBNEMESI 1'
     _inputmodules="nemesi $_inputmodules"
 else
+    _native_rtsp="$_network"
+    _nemesi=no
     _def_nemesi='#undef LIBNEMESI'
     _noinputmodules="nemesi $_noinputmodules"
 fi
+echores "$_nemesi"
 
 echocheck "LIVE555 Streaming Media libraries"
 if test "$_live" = auto  && test "$_network" = yes ; then
@@ -6290,6 +6291,7 @@
              -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
  _inputmodules="live555 $_inputmodules"
 else
+  _live=no
   _def_live='#undef STREAMING_LIVE555'
   _noinputmodules="live555 $_noinputmodules"
 fi