[farsight2/master] Avoid installing versioned plugins

[Olivier Crête]

---
 configure.ac                       |    7 ++++++-
 transmitters/multicast/Makefile.am |    2 +-
 transmitters/rawudp/Makefile.am    |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 20c5c4c..2f2d114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,9 +330,14 @@ AC_SUBST(FS2_LIB_LDFLAGS)
 
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-FS2_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+FS2_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*fs_init_plugin\$\$' $GST_ALL_LDFLAGS"
 AC_SUBST(FS2_PLUGIN_LDFLAGS)
 
+dnl this really should only contain flags, not libs - they get added before
+dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+AC_SUBST(GST_PLUGIN_LDFLAGS)
+
 
 AC_ARG_ENABLE([python],
 	AC_HELP_STRING([--disable-python], [Disable Python bindings]),
diff --git a/transmitters/multicast/Makefile.am b/transmitters/multicast/Makefile.am
index 718e6f1..4af71ec 100644
--- a/transmitters/multicast/Makefile.am
+++ b/transmitters/multicast/Makefile.am
@@ -11,7 +11,7 @@ libmulticast_transmitter_la_SOURCES = \
 # flags used to compile this plugin
 libmulticast_transmitter_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libmulticast_transmitter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libmulticast_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
 libmulticast_transmitter_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
 	$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
diff --git a/transmitters/rawudp/Makefile.am b/transmitters/rawudp/Makefile.am
index 171c6e5..8dee505 100644
--- a/transmitters/rawudp/Makefile.am
+++ b/transmitters/rawudp/Makefile.am
@@ -13,7 +13,7 @@ librawudp_transmitter_la_SOURCES = \
 # flags used to compile this plugin
 librawudp_transmitter_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-librawudp_transmitter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+librawudp_transmitter_la_LDFLAGS = $(FS2_PLUGIN_LDFLAGS)
 librawudp_transmitter_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la \
 	$(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
-- 
1.5.6.5