diff options
| author | Edward Hervey <edward@centricular.com> | 2017-07-11 15:29:44 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-09-07 12:40:44 +0300 |
| commit | e7c33f24ed43189c84cc3a31260ad4963a6bb9c7 (patch) | |
| tree | fa3c1ee6d72e53fcfd17c262695413a6f2b10f76 | |
| parent | d8079ae1fe3d0c39314f318a9775a87600f18922 (diff) | |
pkgconfig: Add private requirements
Add libunwind and dw to the .pc Requires.private. Fixes static library
compilation if gstreamer was compiled with one of those dependencies
https://bugzilla.gnome.org/show_bug.cgi?id=784795
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | pkgconfig/gstreamer.pc.in | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b6b2923f2..de9fcaef8 100644 --- a/configure.ac +++ b/configure.ac @@ -824,12 +824,16 @@ dnl libunwind is optionally used by the leaks tracer PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no) if test "x$HAVE_UNWIND" = "xyes"; then AC_DEFINE(HAVE_UNWIND, 1, [libunwind available]) + UNWIND_REQUIRE=libunwind + AC_SUBST(UNWIND_REQUIRE) fi dnl libdw is optionally used to add source lines and numbers to backtraces PKG_CHECK_MODULES(DW, libdw, HAVE_DW=yes, HAVE_DW=no) if test "x$HAVE_DW" = "xyes"; then AC_DEFINE(HAVE_DW, 1, [libdw available]) + DW_REQUIRE=libdw + AC_SUBST(DW_REQUIRE) fi dnl Check for backtrace() from libc diff --git a/pkgconfig/gstreamer-uninstalled.pc.in b/pkgconfig/gstreamer-uninstalled.pc.in index b8dcdf8e6..d071612d5 100644 --- a/pkgconfig/gstreamer-uninstalled.pc.in +++ b/pkgconfig/gstreamer-uninstalled.pc.in @@ -15,6 +15,6 @@ Name: GStreamer Uninstalled Description: Streaming media framework, Not Installed Version: @VERSION@ Requires: glib-2.0, gobject-2.0 -Requires.private: gmodule-no-export-2.0 +Requires.private: gmodule-no-export-2.0 @UNWIND_REQUIRE@ @DW_REQUIRE@ Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@ 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 b949d6ce8..6ec3cb762 100644 --- a/pkgconfig/gstreamer.pc.in +++ b/pkgconfig/gstreamer.pc.in @@ -13,6 +13,6 @@ Name: GStreamer Description: Streaming media framework Version: @VERSION@ Requires: glib-2.0, gobject-2.0 -Requires.private: gmodule-no-export-2.0 +Requires.private: gmodule-no-export-2.0 @UNWIND_REQUIRE@ @DW_REQUIRE@ Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@ Cflags: -I${includedir} |