Attachment 47032 Details for Bug 37492 – Fix for the bug

[patch] Fix for the bug

0001-Fix-tp-yell-includes-being-read-from-usr-include-ins.patch (text/plain), 1.39 KB, created by vincent on 2011-05-23 02:36:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vincent

Created: 2011-05-23 02:36:16 UTC

Size: 1.39 KB

patch

obsolete

>From 15e8efa68c2427db98f4bdf745a3afc0c2de39ce Mon Sep 17 00:00:00 2001
>From: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
>Date: Mon, 23 May 2011 12:29:52 +0300
>Subject: [PATCH] Fix tp-yell includes being read from /usr/include instead of the submodule
>
>Since tp-yell gets installed in ${PREFIX}/telepathy-1.0, adding
>include paths for some other telepathy library (such as tp-glib)
>would automatically make tp-yell headers discoverable.
>
>Fixed by moving the tp-yell submodule paths before the ones for
>any telepathy library, so these will be found first.
>
>This fixes the build if you have a version of tp-yell installed
>which does not have a symbol that tp-gabble needs.
>---
> src/Makefile.am |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 66a873c..f642db4 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -218,10 +218,10 @@ telepathy_gabble_LDFLAGS = -export-dynamic
> noinst_LTLIBRARIES = libgabble-convenience.la
> 
> AM_CFLAGS = $(ERROR_CFLAGS) -I$(top_srcdir) -I$(top_builddir) \
>+	    @TP_YELL_CFLAGS@ \
> 	    @DBUS_CFLAGS@ @GLIB_CFLAGS@ @WOCKY_CFLAGS@ \
> 	    @HANDLE_LEAK_DEBUG_CFLAGS@ @TP_GLIB_CFLAGS@ \
> 	    @SOUP_CFLAGS@ @NICE_CFLAGS@ @GMODULE_CFLAGS@ \
>-	    @TP_YELL_CFLAGS@ \
> 	    -I $(top_srcdir)/lib -I $(top_builddir)/lib \
> 	    -DG_LOG_DOMAIN=\"gabble\" \
> 	    -DPLUGIN_DIR=\"$(libdir)/telepathy/gabble-0\"
>-- 
>1.7.2.2
>

Actions: View | Splinter Review

Attachments on bug 37492: 47032

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.