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
This commit is contained in:
Edward Hervey 2017-07-11 15:29:44 +02:00 committed by Edward Hervey
parent 2ace5f4191
commit b6064abdfe
3 changed files with 6 additions and 2 deletions

View file

@ -802,12 +802,16 @@ dnl libunwind is optionally used by the leaks tracer
PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no) PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
if test "x$HAVE_UNWIND" = "xyes"; then if test "x$HAVE_UNWIND" = "xyes"; then
AC_DEFINE(HAVE_UNWIND, 1, [libunwind available]) AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
UNWIND_REQUIRE=libunwind
AC_SUBST(UNWIND_REQUIRE)
fi fi
dnl libdw is optionally used to add source lines and numbers to backtraces dnl libdw is optionally used to add source lines and numbers to backtraces
PKG_CHECK_MODULES(DW, libdw, HAVE_DW=yes, HAVE_DW=no) PKG_CHECK_MODULES(DW, libdw, HAVE_DW=yes, HAVE_DW=no)
if test "x$HAVE_DW" = "xyes"; then if test "x$HAVE_DW" = "xyes"; then
AC_DEFINE(HAVE_DW, 1, [libdw available]) AC_DEFINE(HAVE_DW, 1, [libdw available])
DW_REQUIRE=libdw
AC_SUBST(DW_REQUIRE)
fi fi
dnl Check for backtrace() from libc dnl Check for backtrace() from libc

View file

@ -15,6 +15,6 @@ Name: GStreamer Uninstalled
Description: Streaming media framework, Not Installed Description: Streaming media framework, Not Installed
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0, gobject-2.0 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@ 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 Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs

View file

@ -13,6 +13,6 @@ Name: GStreamer
Description: Streaming media framework Description: Streaming media framework
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0, gobject-2.0 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@ Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}