summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-07-01 09:38:01 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-07-01 09:38:01 +0200
commit3d94d3e44d7576a43c8755b2f7b5cf35eb83e8a6 (patch)
treebbe2b67c2a6febadd08bba26908c2ac98106a38e
parent4d61049041cca7824e936394cc96f43e9fa53364 (diff)
omx: Link to gmodule-2.0-no-export for being able to use the g_module_*() API
https://bugzilla.gnome.org/show_bug.cgi?id=732518
-rw-r--r--configure.ac5
-rw-r--r--omx/Makefile.am6
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 206d9de..2ffcb43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,9 @@ dnl *** checks for dependency libraries ***
dnl GLib is required
AG_GST_GLIB_CHECK([2.32])
+dnl Needed by plugins that use g_module_*() API
+PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
+
dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes)
@@ -354,7 +357,7 @@ AC_SUBST(GST_OMX_CFLAGS)
dnl FIXME: do we want to rename to GST_ALL_* ?
dnl add GST_OPTION_CFLAGS, but overridable
-GST_CFLAGS="$GLIB_CFLAGS $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
+GST_CFLAGS="$GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)"
AC_SUBST(GST_CFLAGS)
dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage
GST_LIBS="$GST_LIBS \$(GCOV_LIBS)"
diff --git a/omx/Makefile.am b/omx/Makefile.am
index c9dcbb4..5d90520 100644
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -65,7 +65,8 @@ libgstomx_la_CFLAGS = \
$(GST_GL_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \
- $(GST_CFLAGS)
+ $(GST_CFLAGS) \
+ $(GMODULE_NO_EXPORT_CFLAGS)
libgstomx_la_LIBADD = \
$(GST_GL_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \
@@ -73,7 +74,8 @@ libgstomx_la_LIBADD = \
-lgstpbutils-@GST_API_VERSION@ \
-lgstvideo-@GST_API_VERSION@ \
$(GST_BASE_LIBS) \
- $(GST_LIBS)
+ $(GST_LIBS) \
+ $(GMODULE_NO_EXPORT_LIBS)
libgstomx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = \