[vlc-devel] commit: configure: make sure we are using a rather recent version of liveMedia ( Derk-Jan Hartman )
git version control
git at videolan.org
Sun Jul 27 03:41:14 CEST 2008
vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Sun Jul 27 03:38:04 2008 +0200| [210811cdf0f7e27f81c9a72ff0bd175b5afc96c5]
configure: make sure we are using a rather recent version of liveMedia
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=210811cdf0f7e27f81c9a72ff0bd175b5afc96c5
---
configure.ac | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index e32f6c3..8492c6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1808,6 +1808,22 @@ 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.
+lternatively 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, [
@@ -1839,6 +1855,21 @@ if test "${enable_live555}" != "no"; then
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.
+lternatively you can use --disable-live555 to disable the liveMedia plugin.])
+ ])
+ ])
+
VLC_ADD_PLUGIN([live555])
if test "${SYS}" = "mingw32"; then
More information about the vlc-devel
mailing list