[vlc-commits] configure: move SOCKET_LIBS to Makefiles where needed

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb 12 08:37:57 2015 +0200| [300ce853046238cb4a75b9af0f41d535e40b2d33] | committer: Rémi Denis-Courmont

configure: move SOCKET_LIBS to Makefiles where needed

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=300ce853046238cb4a75b9af0f41d535e40b2d33
---

 configure.ac                     |    4 ----
 modules/video_filter/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index be35d70..72c5341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,10 +648,6 @@ AC_LINK_IFELSE([
     ])],[AC_DEFINE([HAVE_INET_PTON],[1],[Define to 1 if you have inet_pton function])],[AC_LIBOBJ([inet_pton])])
 AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
-
-AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([sap ts remoteosd audiobargraph_a],[${SOCKET_LIBS}])
-])
 AC_SUBST(SOCKET_LIBS)
 
 dnl Check for socklen_t
diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
index c5054f9..dc2b5b4 100644
--- a/modules/video_filter/Makefile.am
+++ b/modules/video_filter/Makefile.am
@@ -196,7 +196,7 @@ video_filter_LTLIBRARIES += \
 
 libremoteosd_plugin_la_SOURCES = video_filter/remoteosd.c video_filter/remoteosd_rfbproto.h
 libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd) $(LIBPTHREAD)
+libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(SOCKET_LIBS) $(LIBPTHREAD)
 if HAVE_GCRYPT
 video_filter_LTLIBRARIES += libremoteosd_plugin.la
 endif