vlc/vlc-1.2 | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 19 19:15:07 2012 +0200| [4eab79d38d0ec1acade691c408d6e289e863b9aa] | committer: Jean-Baptiste Kempf
Update live555 version check (close #5879) (cherry picked from commit 10f2d436c540f5aadecdf69c05adb00435aabce7) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=4eab79d38d0ec1acade691c408d6e289e863b9aa --- configure.ac | 31 ++----------------------------- 1 files changed, 2 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 3694788..6f54404 100644 --- a/configure.ac +++ b/configure.ac @@ -1715,10 +1715,10 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ ]) CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" - AC_CACHE_CHECK([for live555 version 1275091200 or later], [ac_cv_live555], [ + AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ [#include <liveMedia_version.hh> -#if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200) +#if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1324598400) # error BOOM #endif]]) ], [ @@ -1734,34 +1734,7 @@ You can get an updated one from http://www.live555.com/liveMedia .]) AS_IF([test -n "${enable_live555}"], [ AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) ]) - ac_cv_live555_usable="" ], [ - dnl Check that live555 is patched correctly. - AC_CACHE_CHECK([for live555 usability], [ac_cv_live555_usable], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ -[#include <locale.h> -#ifdef __APPLE__ -# include <xlocale.h> -#endif -#undef LC_ALL -#define LC_ALL BOOM -#ifdef LC_ALL_MASK -#include <Locale.hh> -#endif -#include <GroupsockHelper.hh>]], [ -[struct in_addr addr; -our_inet_ntoa(addr, NULL);]]) - ], [ - ac_cv_live555_usable="yes" - ], [ - ac_cv_live555_usable="no" - ]) - ]) - AS_IF([test "$ac_cv_live555_usable" = "no"], [ - AC_MSG_ERROR([liveMedia lacks patches and is not usable. -Please apply our patches from the VLC contrib (contrib/src/live555/). -You can also disable RTSP input with --disable-live555. You were warned.]) - ]) other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" AS_IF([test "${SYS}" = "mingw32"], [ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
