[MPlayer-cvslog] r24584 - in trunk: cfg-common.h configure libmpdemux/Makefile libmpdemux/demux_nemesi.c libmpdemux/demux_nemesi.h libmpdemux/demuxer.c stream/Makefile stream/stream_nemesi.c

[Nico Sabbi]

clu_zero wrote:

>+echores "$_nemesi"
>+
>+if test "$_nemesi" = yes; then
>+    _native_rtsp=no
>+    _def_nemesi='#define LIBNEMESI 1'
>+    _inputmodules="nemesi $_inputmodules"
>+else
>+    _def_nemesi='#undef LIBNEMESI'
>+    _noinputmodules="nemesi $_noinputmodules"
>+fi
> 
> echocheck "LIVE555 Streaming Media libraries"
> if test "$_live" = auto  && test "$_network" = yes ; then
>@@ -6254,11 +6277,11 @@ EOF
>       fi
>   fi
> fi
>-if test "$_live" = yes && test "$_network" = yes ; then
>+if test "$_live" = yes && test "$_network" = yes && test "$_nemesi" = no; then
>   _res_comment="using $_livelibdir"
>   _def_live='#define STREAMING_LIVE555 1'
>  _inputmodules="live555 $_inputmodules"
>-elif test "$_live_dist" = yes && test "$_network" = yes ; then
>+elif test "$_live_dist" = yes && test "$_network" = yes && test "$_nemesi" = no; then
>   _res_comment="using distribution version"
>   _live="yes"
>   _def_live='#define STREAMING_LIVE555 1'
>  
>

I thought that we agreed that nemesi should neither clash nor disable
LIVE555 and native_rtsp: in practice they should all cohexist like
a happy family