Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
e2e6efb7
Commit
e2e6efb7
authored
Dec 18, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Configure: Update live555 requirements"
This reverts commit 4e03fb4f516010c9b2819db6da361b4fdb0b16d2.
parent
c0f9e01e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
3 deletions
+29
-3
configure.ac
configure.ac
+29
-3
No files found.
configure.ac
View file @
e2e6efb7
...
@@ -1715,10 +1715,10 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
...
@@ -1715,10 +1715,10 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
])
])
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
AC_CACHE_CHECK([for live555 version 1
3227840
00 or later], [ac_cv_live555], [
AC_CACHE_CHECK([for live555 version 1
2750912
00 or later], [ac_cv_live555], [
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
[#include <liveMedia_version.hh>
[#include <liveMedia_version.hh>
#if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1
3227840
00)
#if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1
2750912
00)
# error BOOM
# error BOOM
#endif]])
#endif]])
], [
], [
...
@@ -1729,13 +1729,39 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
...
@@ -1729,13 +1729,39 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [
])
])
AS_IF([test "$ac_cv_live555" = "no"], [
AS_IF([test "$ac_cv_live555" = "no"], [
AC_MSG_WARN([liveMedia is missing or its installed version is too old:
AC_MSG_WARN([liveMedia is missing or its installed version is too old:
Version 201
1.12.02
or later is required to proceed.
Version 201
0.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 -n "${enable_live555}"], [
AS_IF([test -n "${enable_live555}"], [
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
])
])
ac_cv_live555_usable=""
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="-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"], [
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment