From b24276b20784b86b02575f4deec8616203940035 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 13 Jul 2007 14:11:22 +0000 Subject: [PATCH] pkgconfig/: Substitute the CFLAGS for libcheck into our .pc file too so that dependent modules will pick it up proper... Original commit message from CVS: * pkgconfig/gstreamer-check-uninstalled.pc.in: * pkgconfig/gstreamer-check.pc.in: Substitute the CFLAGS for libcheck into our .pc file too so that dependent modules will pick it up properly if libcheck is installed into some other prefix. --- ChangeLog | 8 ++++++++ pkgconfig/gstreamer-check-uninstalled.pc.in | 2 +- pkgconfig/gstreamer-check.pc.in | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f1b20c..78d3993 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-07-13 Jan Schmidt + * pkgconfig/gstreamer-check-uninstalled.pc.in: + * pkgconfig/gstreamer-check.pc.in: + Substitute the CFLAGS for libcheck into our .pc file too so that + dependent modules will pick it up properly if libcheck is installed + into some other prefix. + +2007-07-13 Jan Schmidt + * configure.ac: Revert the pkg-config check for libcheck, since it pulls in the wrong non-PIC libcheck.a on Ubuntu and probably Fedora too. We need diff --git a/pkgconfig/gstreamer-check-uninstalled.pc.in b/pkgconfig/gstreamer-check-uninstalled.pc.in index 97ce34f..63bb3a8 100644 --- a/pkgconfig/gstreamer-check-uninstalled.pc.in +++ b/pkgconfig/gstreamer-check-uninstalled.pc.in @@ -10,4 +10,4 @@ Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Version: @VERSION@ Libs: ${libdir}/libgstcheck-@GST_MAJORMINOR@.la @CHECK_LIBS@ -lm -Cflags: -I${includedir} +Cflags: -I${includedir} @CHECK_CFLAGS@ diff --git a/pkgconfig/gstreamer-check.pc.in b/pkgconfig/gstreamer-check.pc.in index 74d8979..f96d1d4 100644 --- a/pkgconfig/gstreamer-check.pc.in +++ b/pkgconfig/gstreamer-check.pc.in @@ -8,4 +8,4 @@ Description: Unit testing helper library for GStreamer modules Requires: gstreamer-@GST_MAJORMINOR@ Version: @VERSION@ Libs: -L${libdir} -lgstcheck-@GST_MAJORMINOR@ @CHECK_LIBS@ -lm -Cflags: -I${includedir} +Cflags: -I${includedir} @CHECK_CFLAGS@ -- 2.7.4