brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add telepathy-glib as a dependency

Browse Source 
We'll be refactoring the Telepathy client to use telepathy-glib, so we need to
build it.
This commit is contained in:
Morten Mjelva 2011-02-07 15:57:19 +01:00 committed by Guillaume Desmottes
parent 8c80a58fa4
commit 36a624aafd
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -70,6 +70,7 @@ LIBECAL_REQUIRED=1.6.0
LIBEDATASERVER_REQUIRED=1.2.0 LIBEDATASERVER_REQUIRED=1.2.0
LIBEDATASERVERUI2_REQUIRED=1.2.0 LIBEDATASERVERUI2_REQUIRED=1.2.0
LIBEDATASERVERUI3_REQUIRED=2.91.6 LIBEDATASERVERUI3_REQUIRED=2.91.6
TELEPATHY_GLIB_MIN_VERSION=0.13.12
# Collect more than 20 libraries for a prize! # 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 clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
libstartup-notification-1.0 libstartup-notification-1.0
gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION 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` GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to]) AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])

1
src/Makefile.am
View File

@ -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=Clutter-1.0 \
--include=ClutterX11-1.0 \ --include=ClutterX11-1.0 \
--include=Meta-2.91 \ --include=Meta-2.91 \
--include=TelepathyGLib-0.12 \
--libtool="$(LIBTOOL)" \ --libtool="$(LIBTOOL)" \
--add-include-path=$(builddir) \ --add-include-path=$(builddir) \
--include=St-1.0 \ --include=St-1.0 \

10
tools/build/gnome-shell.modules
View File

@ -16,6 +16,8 @@
<repository type="cvs" name="libxklavier.freedesktop.org" <repository type="cvs" name="libxklavier.freedesktop.org"
cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xklavier" cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xklavier"
password=""/> password=""/>
<repository type="git" name="git.collabora.co.uk"
href="git://git.collabora.co.uk/git/"/>
<autotools id="gobject-introspection"> <autotools id="gobject-introspection">
<branch repo="git.gnome.org" module="gobject-introspection"/> <branch repo="git.gnome.org" module="gobject-introspection"/>
@ -211,6 +213,13 @@
</dependencies> </dependencies>
</autotools> </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"> <autotools id="gnome-shell">
<branch repo="git.gnome.org" module="gnome-shell"/> <branch repo="git.gnome.org" module="gnome-shell"/>
<dependencies> <dependencies>
@ -227,6 +236,7 @@
<dep package="libcanberra"/> <dep package="libcanberra"/>
<dep package="gnome-settings-daemon"/> <dep package="gnome-settings-daemon"/>
<dep package="gnome-bluetooth"/> <dep package="gnome-bluetooth"/>
<dep package="telepathy-glib"/>
</dependencies> </dependencies>
</autotools> </autotools>