[vlc-devel] commit: Remove non-sensical NPT c omputation code from c9569b35. ( Rémi Denis- Courmont )

[Derk-Jan Hartman]

On 21 jul 2008, at 11:34, Derk-Jan Hartman wrote:
>>>  (P.S. Ross, do you have a recent VERSION_INT from the last "API
>>> change" ? )
>>
>> Yes, everyone should be using a version with a
>> LIVEMEDIA_LIBRARY_VERSION_INT > 1214895600 (Versions before this
>> have some bugs that are potentially significant for RTSP clients,
>> such as VLC.)


OK, something like this is required, but I have a feeling this can be  
done "better" if some autotools wizz can take a look :D

DJ


diff --git a/configure.ac b/configure.ac
index bfbe3ce..e1ccc9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1808,6 +1808,19 @@ if test "${enable_live555}" != "no"; then
        CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
      fi
      CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
+    AC_CHECK_HEADERS(liveMedia_version.hh, [
+      AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+      AC_EGREP_CPP(yes,
+        [#include <liveMedia_version.hh>
+         #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
+         #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+         yes
+         #endif
+         #endif],
+        [AC_MSG_RESULT([yes])
+         AC_MSG_ERROR([Your version of liveMedia is too old: you may  
get a more recent one from http://www.live555.com/liveMedia.  
Alternatively you can use --disable-live555 to disable the liveMedia  
plugin.])
+      ])
+    ])
      AC_CHECK_HEADERS(liveMedia.hh, [
        VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
        AC_CHECK_LIB(liveMedia_pic, main, [
@@ -1830,6 +1843,7 @@ if test "${enable_live555}" != "no"; then
      AC_LANG_POP(C++)
    else
      AC_MSG_CHECKING(for liveMedia/libliveMedia.a in $ 
{with_live555_tree})
+
      real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`"
      if test -z "${real_live555_tree}"; then
        dnl  The given directory can't be found
@@ -1838,6 +1852,19 @@ if test "${enable_live555}" != "no"; then
      fi
      if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then
        AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
+      AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/ 
liveMedia_version.hh,[
+        AC_MSG_CHECKING(for liveMedia version >= 1214895600 )
+        AC_EGREP_CPP(yes,
+          [#include "${real_live555_tree}/liveMedia/include/ 
liveMedia_version.hh"
+           #ifdef LIVEMEDIA_LIBRARY_VERSION_INT
+           #if LIVEMEDIA_LIBRARY_VERSION_INT < 1214895600
+           yes
+           #endif
+           #endif],
+          [AC_MSG_RESULT([yes])
+           AC_MSG_ERROR([Your version of liveMedia is too old: you  
may get a more recent one from http://www.live555.com/liveMedia.  
Alternatively you can use --disable-live555 to disable the liveMedia  
plugin.])
+        ])
+      ])

        VLC_ADD_PLUGIN([live555])