From 647cdef6fbf62d04526be23245eb6ff047bbc84f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 25 Nov 2012 23:42:57 +0000 Subject: [PATCH] gstreamer-1.0.pc: move gmodule-no-export-2.0 dependency to Requires.private Users of GStreamer are not generally expected to use the GModule API directly. so don't force them all to link against it. While we're at it, no need to define this via configure.ac really, just put the dependencies directly into the .pc.in file. --- configure.ac | 3 --- pkgconfig/gstreamer-uninstalled.pc.in | 3 ++- pkgconfig/gstreamer.pc.in | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f0e3bbe..b92112c 100644 --- a/configure.ac +++ b/configure.ac @@ -615,9 +615,6 @@ AC_DEFINE_UNQUOTED(GST_DATADIR, "$DATADIR", [data dir]) dnl set location of plugin directory AG_GST_SET_PLUGINDIR -GST_PKG_DEPS="glib-2.0, gobject-2.0, gmodule-no-export-2.0, gthread-2.0" -AC_SUBST(GST_PKG_DEPS) - dnl make sure it doesn't complain about unused variables if debugging is disabled NO_WARNINGS="" if test "x${GST_DISABLE_GST_DEBUG}" = "xyes"; then diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in index 9e5602b..8f2f96e 100644 --- a/pkgconfig/gstreamer-uninstalled.pc.in +++ b/pkgconfig/gstreamer-uninstalled.pc.in @@ -12,7 +12,8 @@ typelibdir=@abs_top_builddir@/gst Name: GStreamer Uninstalled Description: Streaming media framework, Not Installed Version: @VERSION@ -Requires: @GST_PKG_DEPS@ +Requires: glib-2.0, gobject-2.0, gthread-2.0 +Requires.private: gmodule-no-export-2.0 Libs: @abs_top_builddir@/gst/libgstreamer-@GST_API_VERSION@.la # FIXME: the libs dir doesn't really belong here Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs diff --git a/pkgconfig/gstreamer.pc.in b/pkgconfig/gstreamer.pc.in index 914e186..cde70de 100644 --- a/pkgconfig/gstreamer.pc.in +++ b/pkgconfig/gstreamer.pc.in @@ -11,7 +11,8 @@ typelibdir=${libdir}/girepository-1.0 Name: GStreamer Description: Streaming media framework -Requires: @GST_PKG_DEPS@ Version: @VERSION@ +Requires: glib-2.0, gobject-2.0, gthread-2.0 +Requires.private: gmodule-no-export-2.0 Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@ Cflags: -I${includedir} -- 2.7.4