Commit 487b82d0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Configure: do not die if live555 version is too old, just warn about it

If you --enable-live555 and are too old, it will error
Else, if you are too old, it will error

If you use live555-tree, you are on your own.
parent 7294042b
...@@ -1748,38 +1748,44 @@ if test "${enable_live555}" != "no"; then ...@@ -1748,38 +1748,44 @@ if test "${enable_live555}" != "no"; then
#endif #endif
#endif], #endif],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. if test "${enable_live555}" == "yes"; then
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.]) lternatively you can use --disable-live555 to disable the liveMedia plugin.])
],[ else
AC_MSG_RESULT([yes]) AC_MSG_WARN([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia.])
]) fi
]) ],[
other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" AC_MSG_RESULT([yes])
other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
if test "${SYS}" = "mingw32"; then other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
# add ws2_32 for closesocket, select, recv if test "${SYS}" = "mingw32"; then
other_libs="$other_libs -lws2_32" # add ws2_32 for closesocket, select, recv
elif test "${SYS}" = "mingwce"; then other_libs="$other_libs -lws2_32"
# add ws2 for closesocket, select, recv elif test "${SYS}" = "mingwce"; then
other_libs="$other_libs -lws2" # add ws2 for closesocket, select, recv
fi other_libs="$other_libs -lws2"
dnl We need to check for pic because live555 don't provide shared libs fi
dnl and we want to build a plugins so we need -fPIC on some arch.
AC_CHECK_HEADERS(liveMedia.hh, [ dnl We need to check for pic because live555 don't provide shared libs
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) dnl and we want to build a plugins so we need -fPIC on some arch.
AC_CHECK_LIB(liveMedia_pic, main, [ AC_CHECK_HEADERS(liveMedia.hh, [
VLC_ADD_PLUGIN([live555]) VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}]) AC_CHECK_LIB(liveMedia_pic, main, [
],[ VLC_ADD_PLUGIN([live555])
AC_CHECK_LIB(liveMedia, main, [ VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
VLC_ADD_PLUGIN([live555]) ],[
VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) AC_CHECK_LIB(liveMedia, main, [
],[],[${other_libs}]) ],[${other_libs_pic}]) VLC_ADD_PLUGIN([live555])
],[ VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
AC_MSG_WARN([The development files for liveMedia (live555) can't be found]) ],[],[${other_libs}]) ],[${other_libs_pic}])
]) ],[
CPPFLAGS="${CPPFLAGS_save}" AC_MSG_WARN([The development files for liveMedia (live555) can't be found])
AC_LANG_POP(C++) ])
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)
])
])
else else
AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_live555_tree}) AC_MSG_CHECKING(for liveMedia/libliveMedia.a in ${with_live555_tree})
real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`" real_live555_tree="`cd ${with_live555_tree} 2>/dev/null && pwd`"
......
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