resindvd, frei0r: link to libgmodule-2.0 in plugins that use g_module_* API
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 30 Nov 2012 20:01:16 +0000 (20:01 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Fri, 30 Nov 2012 20:01:16 +0000 (20:01 +0000)
Probably needed for other plugins as well.

configure.ac
ext/resindvd/Makefile.am
gst/frei0r/Makefile.am

index a773a06..0567e0c 100644 (file)
@@ -234,6 +234,9 @@ AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 dnl Needed for GtkBuilder to autoconnect signals
 PKG_CHECK_MODULES(GMODULE_EXPORT, gmodule-export-2.0, HAVE_GMODULE_EXPORT=yes, HAVE_GMODULE_EXPORT=no)
 
+dnl Needed by plugins that use g_module_*() API
+PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
+
 dnl x11 is optional for librfb
 HAVE_X11=NO
 PKG_CHECK_MODULES(X11, x11, HAVE_X11=yes, HAVE_X11=no)
index 1ad4a1d..bc51f9b 100644 (file)
@@ -18,7 +18,7 @@ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 $(GST_CFLAGS) $(DVDNAV_CFLAGS)
 libgstresindvd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 -lgstvideo-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
-$(GST_BASE_LIBS) $(GST_LIBS) $(DVDNAV_LIBS)
+$(GST_BASE_LIBS) $(GST_LIBS) $(GMODULE_NO_EXPORT_LIBS) $(DVDNAV_LIBS)
 libgstresindvd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstresindvd_la_LIBTOOLFLAGS = --tag=disable-static
 
index 79b23b8..933e486 100644 (file)
@@ -7,8 +7,8 @@ libgstfrei0r_la_SOURCES = \
        gstfrei0rmixer.c
 
 libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
-       -lgstvideo-@GST_API_VERSION@
+libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
+       $(GST_BASE_LIBS) $(GST_LIBS) $(GMODULE_NO_EXPORT_LIBS)
 libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static