Commit 32653c83 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

configure: cache live555 version check

parent 0f00db90
...@@ -1750,24 +1750,26 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ ...@@ -1750,24 +1750,26 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
]) ])
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
AC_CHECK_HEADERS([liveMedia_version.hh], [ AC_CACHE_CHECK([for live555 version 1275091200 or later], [ac_cv_live555], [
AC_MSG_CHECKING(for liveMedia version >= 1275091200 ) AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
AC_EGREP_CPP(yes, [#include <liveMedia_version.hh>
[#include <liveMedia_version.hh> #if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200)
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT # error BOOM
#if LIVEMEDIA_LIBRARY_VERSION_INT < 1275091200 #endif]])
yes ], [
#endif ac_cv_live555="yes"
#endif], ], [
[AC_MSG_RESULT([no]) ac_cv_live555="no"
AC_MSG_WARN([The installed liveMedia version is too old: ])
])
AS_IF([test "$ac_cv_live555" = "no"], [
AC_MSG_WARN([liveMedia is missing or its installed version is too old:
Version 2010.05.29 or later is required to proceed. Version 2010.05.29 or later is required to proceed.
You can get an updated one from http://www.live555.com/liveMedia .]) You can get an updated one from http://www.live555.com/liveMedia .])
AS_IF([test "${enable_live555}" = "yes"], [ AS_IF([test -n "${enable_live555}"], [
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable the plugin.]) AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
]) ])
], [ ], [
AC_MSG_RESULT([yes])
other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
AS_IF([test "${SYS}" = "mingw32"], [ AS_IF([test "${SYS}" = "mingw32"], [
...@@ -1790,7 +1792,6 @@ You can get an updated one from http://www.live555.com/liveMedia .]) ...@@ -1790,7 +1792,6 @@ You can get an updated one from http://www.live555.com/liveMedia .])
VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
],[],[${other_libs}])],[${other_libs_pic}]) ],[],[${other_libs}])],[${other_libs_pic}])
]) ])
])
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++) AC_LANG_POP(C++)
]) ])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment