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
7b0dd84f
Commit
7b0dd84f
authored
Jul 31, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix live detection on win32
+ a few cosmetics
parent
b02d9f27
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
21 deletions
+18
-21
configure.ac
configure.ac
+18
-21
No files found.
configure.ac
View file @
7b0dd84f
...
@@ -1782,11 +1782,11 @@ if test "${enable_livedotcom}"
...
@@ -1782,11 +1782,11 @@ if test "${enable_livedotcom}"
then
then
AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
fi
fi
if test "${enable_livedotcom}" = "no"
if test "${enable_livedotcom}" = "no"
then
then
enable_live555="no"
enable_live555="no"
fi
fi
AC_ARG_ENABLE(live555,
AC_ARG_ENABLE(live555,
[ --enable-live555 live555 RTSP input plugin (default enabled)])
[ --enable-live555 live555 RTSP input plugin (default enabled)])
if test "${enable_live555}" != "no"; then
if test "${enable_live555}" != "no"; then
...
@@ -1812,7 +1812,7 @@ if test "${enable_live555}" != "no"; then
...
@@ -1812,7 +1812,7 @@ if test "${enable_live555}" != "no"; then
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
AC_CHECK_HEADERS(liveMedia_version.hh, [
AC_CHECK_HEADERS(liveMedia_version.hh, [
AC_MSG_CHECKING(for liveMedia version
<
1214895600 )
AC_MSG_CHECKING(for liveMedia version
>=
1214895600 )
AC_EGREP_CPP(yes,
AC_EGREP_CPP(yes,
[#include <liveMedia_version.hh>
[#include <liveMedia_version.hh>
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT
...
@@ -1820,29 +1820,24 @@ if test "${enable_live555}" != "no"; then
...
@@ -1820,29 +1820,24 @@ if test "${enable_live555}" != "no"; then
yes
yes
#endif
#endif
#endif],
#endif],
[AC_MSG_RESULT([
yes
])
[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.
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.])
],[
AC_MSG_RESULT([yes])
])
])
])
])
other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
other_libs="$other_libs -lws2_32"
fi
AC_CHECK_HEADERS(liveMedia.hh, [
AC_CHECK_HEADERS(liveMedia.hh, [
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
AC_CHECK_LIB(liveMedia_pic, main, [
# We have -lliveMedia_pic, build plugins
VLC_ADD_PLUGIN([live555])
VLC_ADD_LIBS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
], [
AC_CHECK_LIB(liveMedia, main, [
AC_CHECK_LIB(liveMedia, main, [
# We only have -lliveMedia, do builtins
VLC_ADD_PLUGIN([live555])
VLC_ADD_PLUGIN([live555])
VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}])
],[],[-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
],[],[${other_libs}])
],[-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic] )
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
VLC_ADD_LIBS([live555],[-lws2_32])
fi
])
])
CPPFLAGS="${CPPFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
AC_LANG_POP(C++)
AC_LANG_POP(C++)
...
@@ -1858,7 +1853,7 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
...
@@ -1858,7 +1853,7 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a)
AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[
AC_CHECK_HEADERS(${real_live555_tree}/liveMedia/include/liveMedia_version.hh,[
AC_MSG_CHECKING(for liveMedia version
<
1214895600 )
AC_MSG_CHECKING(for liveMedia version
>=
1214895600 )
AC_EGREP_CPP(yes,
AC_EGREP_CPP(yes,
[#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh"
[#include "${real_live555_tree}/liveMedia/include/liveMedia_version.hh"
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT
...
@@ -1866,9 +1861,11 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
...
@@ -1866,9 +1861,11 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.])
yes
yes
#endif
#endif
#endif],
#endif],
[AC_MSG_RESULT([
yes
])
[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.
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.])
],[
AC_MSG_RESULT([yes])
])
])
])
])
...
...
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