[MPlayer-cvslog] r38335 - trunk/configure

[reimar]

Author: reimar
Date: Wed Feb 23 21:36:04 2022
New Revision: 38335

Log:
configure: disable live555 by default.

We only support an ancient version, and FFmpeg
should handle basic rtsp at least.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Feb 23 21:18:46 2022	(r38334)
+++ trunk/configure	Wed Feb 23 21:36:04 2022	(r38335)
@@ -772,7 +772,7 @@ type dvdread-config >/dev/null 2>&1 && _
 _dvdread=auto
 _xanim=auto
 _real=auto
-_live=auto
+_live=no
 _nemesi=auto
 _librtmp=auto
 _native_rtsp=yes
@@ -7357,53 +7357,9 @@ fi
 echores "$_nemesi"
 
 echocheck "LIVE555 Streaming Media libraries"
-if test "$_live" = auto  && test "$networking" = yes ; then
-  cat > $TMPCPP << EOF
-#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
-#include <liveMedia.hh>
-#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
-#error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
-#endif
-#include "BasicUsageEnvironment.hh"
-int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
-EOF
-
-  _live=no
-  for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
-    _livelibdir=$(echo $I| sed s/-I//)
-    inc_tmp="-I$_livelibdir/liveMedia/include \
-             -I$_livelibdir/UsageEnvironment/include \
-             -I$_livelibdir/BasicUsageEnvironment/include \
-             -I$_livelibdir/groupsock/include"
-    ld_tmp="$_livelibdir/liveMedia/libliveMedia.a \
-            $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
-            $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
-            $_livelibdir/groupsock/libgroupsock.a \
-            -lstdc++ $ld_sock"
-    test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
-        cxx_check $inc_tmp $ld_tmp &&
-      extra_ldflags="$ld_tmp $extra_ldflags" &&
-      extra_cxxflags="$inc_tmp" &&
-      _live=yes && break
-  done
-  if test "$_live" != yes ; then
-      for ld_tmp in "-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment -lstdc++" "-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic -lstdc++" ; do
-          inc_tmp="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
-          cxx_check $inc_tmp $ld_tmp && _live_dist=yes && break
-      done
-  fi
-fi
 if test "$_live" = yes && test "$networking" = yes; then
-  test $_livelibdir && res_comment="using $_livelibdir"
   def_live='#define CONFIG_LIVE555 1'
  inputmodules="live555 $inputmodules"
-elif test "$_live_dist" = yes && test "$networking" = yes; then
-  res_comment="using distribution version"
-  _live="yes"
-  def_live='#define CONFIG_LIVE555 1'
-  extra_ldflags="$extra_ldflags $ld_tmp"
-  extra_cxxflags="$inc_tmp"
- inputmodules="live555 $inputmodules"
 else
   _live=no
   def_live='#undef CONFIG_LIVE555'