/pidgin/main: 04122d521556: Export GStreamer version in pkgconfi...
David Woodhouse
David.Woodhouse at intel.com
Thu Mar 12 11:58:17 EDT 2015
Changeset: 04122d5215566e301b0feee344ff9d26e2156136
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: 2015-03-12 14:34 +0000
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/04122d521556
Description:
Export GStreamer version in pkgconfig variable
Some plugins like pidgin-sipe want to know which version of GStreamer
we're built against. It currently assumes that libpurple-3 will be using
gstreamer-1.0 and libpurple-2 will be using gstreamer-0.10.
That isn't strictly true since libpurple-3 *can* be built against
gstreamer-0.10. And it gets even less true when we allow libpurple-2 to
be built against gstreamer-1.0 (qv).
This exports the information so that it's available by running
pkg-config --variable=gstreamer purple-3
and we don't have to guess.
diffstat:
configure.ac | 5 +++++
libpurple/data/purple-3.pc.in | 1 +
2 files changed, 6 insertions(+), 0 deletions(-)
diffs (26 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1089,6 +1089,11 @@ elif test "x$with_gtk" == "x2" -a "x$wit
AC_MSG_ERROR([WebKitGTK+ 2.0 cannot be mixed with GStreamer 1.0.
Please switch to WebKitGTK+ 3.0 or GStreamer 0.10.])
fi
+if test "x$with_gstreamer" == "x0.10" -o "x$with_gstreamer" == "x1.0"; then
+ AC_SUBST(GSTREAMER_VER, [$with_gstreamer])
+else
+ AC_SUBST(GSTREAMER_VER, "")
+fi
dnl #######################################################################
dnl # Check for GStreamer Video
diff --git a/libpurple/data/purple-3.pc.in b/libpurple/data/purple-3.pc.in
--- a/libpurple/data/purple-3.pc.in
+++ b/libpurple/data/purple-3.pc.in
@@ -5,6 +5,7 @@ includedir=@includedir@/libpurple
datarootdir=@datarootdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
+gstreamer=@GSTREAMER_VER@
plugindir=${libdir}/purple- at PURPLE_MAJOR_VERSION@
More information about the Commits
mailing list