Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
d17b37cf
Commit
d17b37cf
authored
Aug 06, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vlc-wrapper needs -lsocket on Solaris (fixes: #3035)
parent
a924dfab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
bin/Makefile.am
bin/Makefile.am
+1
-0
configure.ac
configure.ac
+4
-2
No files found.
bin/Makefile.am
View file @
d17b37cf
...
@@ -23,6 +23,7 @@ vlc_SOURCES = winvlc.c
...
@@ -23,6 +23,7 @@ vlc_SOURCES = winvlc.c
endif
endif
vlc_wrapper_SOURCES
=
rootwrap.c
vlc_wrapper_SOURCES
=
rootwrap.c
vlc_wrapper_LDADD
=
$(SOCKET_LIBS)
vlc_DEPENDENCIES
=
../src/libvlc.sym
vlc_DEPENDENCIES
=
../src/libvlc.sym
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--ldflags
vlc
`
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--ldflags
vlc
`
...
...
configure.ac
View file @
d17b37cf
...
@@ -596,12 +596,14 @@ if test ${ac_cv_langinfo_codeset} = yes; then
...
@@ -596,12 +596,14 @@ if test ${ac_cv_langinfo_codeset} = yes; then
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
fi
SOCKET_LIBS=""
AC_CHECK_FUNCS(connect,,[
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
AC_CHECK_LIB(socket,connect,[
VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket)
VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket)
LIBS_socket
="-lsocket"
SOCKET_LIBS
="-lsocket"
])
])
])
])
AC_SUBST(SOCKET_LIBS)
AC_CHECK_FUNCS(send,,[
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
AC_CHECK_LIB(socket,send,[
...
@@ -652,7 +654,7 @@ dnl -lnsl and -lsocket are needed on Solaris;
...
@@ -652,7 +654,7 @@ dnl -lnsl and -lsocket are needed on Solaris;
dnl we purposedly make the test fail on Windows
dnl we purposedly make the test fail on Windows
LIBS_save="${LIBS}"
LIBS_save="${LIBS}"
AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.])
AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.])
AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${
LIBS_socket
}])
AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${
SOCKET_LIBS
}])
dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro
dnl are
dnl are
...
...
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