From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu, 9 Jun 2011 09:28:44 +0000 (+0100)
Subject: Merge branch 'call'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=8944f13286ba5293781f2d57980da284cb2aa29d

Merge branch 'call'
---

8944f13286ba5293781f2d57980da284cb2aa29d
diff --cc configure.ac
index 3e998de9,fbe42221..a8a272be
--- a/configure.ac
+++ b/configure.ac
@@@ -554,9 -563,8 +592,9 @@@ Configure summary
  	Spell checking (enchant)....:  ${have_enchant}
  	Display maps (libchamplain).:  ${have_libchamplain}
  	Location awareness (Geoclue):  ${have_geoclue}
 +	Geocode support (Geoclue):     ${have_geocode}
  	Adium themes (Webkit).......:  ${have_webkit}
- 	Meego widgets ..............:  ${have_meego}
+ 	Meego widgets...............:  ${have_meego}
  	Control center embedding....:  ${have_control_center_embedding}
  	Cheese webcam support ......:  ${have_cheese}
  
diff --cc libempathy/Makefile.am
index 41cec88f,186f08aa..48846311
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@@ -10,8 -10,8 +10,9 @@@ AM_CPPFLAGS 
  	-DG_LOG_DOMAIN=\"empathy\"			\
  	-DGCR_API_SUBJECT_TO_CHANGE			\
  	$(EMPATHY_CFLAGS)				\
+ 	$(YELL_CFLAGS)					\
  	$(GEOCLUE_CFLAGS)				\
 +	$(GEOCODE_CFLAGS)				\
  	$(NETWORK_MANAGER_CFLAGS)			\
  	$(CONNMAN_CFLAGS)				\
  	$(WARN_CFLAGS)					\