Merge branch 'call'
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:28:44 +0000 (10:28 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 9 Jun 2011 09:28:44 +0000 (10:28 +0100)
1  2 
configure.ac
libempathy-gtk/Makefile.am
libempathy/Makefile.am
libempathy/empathy-contact.c

diff --cc 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}
  
Simple merge
@@@ -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)                                  \
Simple merge