[gnome-shell] Add telepathy-glib as a dependency
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Add telepathy-glib as a dependency
- Date: Wed, 16 Feb 2011 09:15:15 +0000 (UTC)
commit 36a624aafd0c6ba3d631e571ca546f2da2f3fce8
Author: Morten Mjelva <morten mjelva gmail com>
Date: Mon Feb 7 15:57:19 2011 +0100
Add telepathy-glib as a dependency
We'll be refactoring the Telepathy client to use telepathy-glib, so we need to
build it.
configure.ac | 4 +++-
src/Makefile.am | 1 +
tools/build/gnome-shell.modules | 10 ++++++++++
3 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 20e4347..92976cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ LIBECAL_REQUIRED=1.6.0
LIBEDATASERVER_REQUIRED=1.2.0
LIBEDATASERVERUI2_REQUIRED=1.2.0
LIBEDATASERVERUI3_REQUIRED=2.91.6
+TELEPATHY_GLIB_MIN_VERSION=0.13.12
# Collect more than 20 libraries for a prize!
@@ -84,7 +85,8 @@ PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION
clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
libstartup-notification-1.0
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
- libcanberra)
+ libcanberra
+ telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION)
GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
diff --git a/src/Makefile.am b/src/Makefile.am
index 9c69344..33d97e5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -232,6 +232,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) St-1.0.gir libgnome-shell.la Makefile
--include=Clutter-1.0 \
--include=ClutterX11-1.0 \
--include=Meta-2.91 \
+ --include=TelepathyGLib-0.12 \
--libtool="$(LIBTOOL)" \
--add-include-path=$(builddir) \
--include=St-1.0 \
diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.modules
index 91803d6..23385f6 100644
--- a/tools/build/gnome-shell.modules
+++ b/tools/build/gnome-shell.modules
@@ -16,6 +16,8 @@
<repository type="cvs" name="libxklavier.freedesktop.org"
cvsroot=":pserver:anoncvs anoncvs freedesktop org:/cvs/xklavier"
password=""/>
+ <repository type="git" name="git.collabora.co.uk"
+ href="git://git.collabora.co.uk/git/"/>
<autotools id="gobject-introspection">
<branch repo="git.gnome.org" module="gobject-introspection"/>
@@ -211,6 +213,13 @@
</dependencies>
</autotools>
+ <autotools id="telepathy-glib">
+ <branch repo="git.collabora.co.uk" module="telepathy-glib"/>
+ <dependencies>
+ <dep package="gobject-introspection"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gnome-shell">
<branch repo="git.gnome.org" module="gnome-shell"/>
<dependencies>
@@ -227,6 +236,7 @@
<dep package="libcanberra"/>
<dep package="gnome-settings-daemon"/>
<dep package="gnome-bluetooth"/>
+ <dep package="telepathy-glib"/>
</dependencies>
</autotools>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]