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

vlc-wrapper needs -lsocket on Solaris (fixes: #3035)

(cherry picked from commit d17b37cf)
parent 3b931305
...@@ -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`
......
...@@ -594,12 +594,14 @@ if test ${ac_cv_langinfo_codeset} = yes; then ...@@ -594,12 +594,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,[
...@@ -650,7 +652,7 @@ dnl -lnsl and -lsocket are needed on Solaris; ...@@ -650,7 +652,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
......
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