[MPlayer-dev-eng] [PATCH] configure LIVE autodetection

[Torinthiel]

I have copied LIVE version test from libmpdemux/demux_rtp_internal.h to
./configure script. Could someone look at it and say if it is ok to
apply? Especially there was a #undef STREAM_SEEK just before #include
in demux_rtp_internal.h, and however I don't think it has any effect on
test, I'm not sure about it.

The $TMPC change is for gcc to accept c++ in headers. It leaves no tmp
files behind, as $TMPCPP is removed along with other temporary files.
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: B06901F1 fpr: FAA3 559F CAE9 34DE CDC8  7346 2B6E 39F2 B069 01F1
 "No classmates may be used during this examination"
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.889
diff -u -r1.889 configure
--- configure	2 Aug 2004 04:24:36 -0000	1.889
+++ configure	4 Aug 2004 17:49:15 -0000
@@ -169,7 +169,7 @@
   --disable-network      disable network support (for: http/mms/rtp) [enable]
   --enable-winsock2      enable winsock2 usage [autodetect]
   --enable-smb           enable Samba (SMB) input support [autodetect]
-  --enable-live          enable LIVE.COM Streaming Media support [disable]
+  --enable-live          enable LIVE.COM Streaming Media support [autodetect]
   --disable-dvdread      Disable libdvdread support [autodetect]
   --disable-mpdvdkit     Disable mpdvdkit/mpdvdkit2 support [autodetect]
   --disable-cdparanoia   Disable cdparanoia support [autodetect]
@@ -1231,7 +1231,7 @@
 _dvdkit=auto
 _xanim=auto
 _real=auto
-_live=no
+_live=auto
 _xinerama=auto
 _mga=auto
 _xmga=auto
@@ -5215,11 +5215,21 @@
 
 echocheck "LIVE.COM Streaming Media libraries"
 if test "$_live" = auto  && test "$_network" = 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)
+  _TMPC=$TMPC
+  TMPC=$TMPCPP
+  cat >$TMPC <<EOF
+#include <liveMedia.hh>
+#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200)
+#error Please upgrade to version 2004.07.19 or later of the "LIVE.COM Streaming Media" libraries - available from <www.live.com/liveMedia/>
+#endif
+int main(void) {}
+EOF
+  if cc_check -I$_livelibdir/liveMedia/include/ -I$_livelibdir/UsageEnvironment/include -I$_livelibdir/groupsock/include; then
+    _live=yes
+  else
+    _live=no
+  fi
+  TMPC=$_TMPC
 fi
 if test "$_live" = yes && test "$_network" = yes ; then
   echores "yes (using $_livelibdir)"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20040804/0b8d0368/attachment.pgp>