From b6064abdfe980c0203f0ab083b5622336b5062f7 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 11 Jul 2017 15:29:44 +0200 Subject: [PATCH] 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 --- configure.ac | 4 ++++ pkgconfig/gstreamer-uninstalled.pc.in | 2 +- pkgconfig/gstreamer.pc.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 58f1944..d8ce487 100644 --- a/configure.ac +++ b/configure.ac @@ -802,12 +802,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 b8dcdf8..d071612 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 b949d6c..6ec3cb7 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} -- 2.7.4