pkgconfig: Add private requirements
authorEdward Hervey <edward@centricular.com>
Tue, 11 Jul 2017 13:29:44 +0000 (15:29 +0200)
committerEdward Hervey <bilboed@bilboed.com>
Tue, 11 Jul 2017 13:31:07 +0000 (15:31 +0200)
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
pkgconfig/gstreamer-uninstalled.pc.in
pkgconfig/gstreamer.pc.in

index 58f1944..d8ce487 100644 (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)
 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
index b8dcdf8..d071612 100644 (file)
@@ -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
index b949d6c..6ec3cb7 100644 (file)
@@ -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}