From caa9014bceffa8154de1692c62ba3c99cbc04d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 30 Nov 2012 20:01:16 +0000 Subject: [PATCH] resindvd, frei0r: link to libgmodule-2.0 in plugins that use g_module_* API Probably needed for other plugins as well. --- configure.ac | 3 +++ ext/resindvd/Makefile.am | 2 +- gst/frei0r/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a773a068e6..0567e0c6e7 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/ext/resindvd/Makefile.am b/ext/resindvd/Makefile.am index 1ad4a1d547..bc51f9b130 100644 --- a/ext/resindvd/Makefile.am +++ b/ext/resindvd/Makefile.am @@ -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 diff --git a/gst/frei0r/Makefile.am b/gst/frei0r/Makefile.am index 79b23b80e7..933e486b8e 100644 --- a/gst/frei0r/Makefile.am +++ b/gst/frei0r/Makefile.am @@ -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