conduit r1491 - in trunk: . conduit/modules/GoogleModule/gdata

[johncarr svn gnome org]

Author: johncarr
Date: Tue Jun  3 19:34:29 2008
New Revision: 1491
URL: http://svn.gnome.org/viewvc/conduit?rev=1491&view=rev

Log:
2008-06-03  John Carr  <john carr unrouted co uk>

        * conduit/modules/gdata/Makefile.am:
        * configure.ac:
        Include contacts stuff in our shipped GData.
        Fixes #536485 (Andreas BÃttger)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/GoogleModule/gdata/Makefile.am
   trunk/configure.ac

Modified: trunk/conduit/modules/GoogleModule/gdata/Makefile.am
==============================================================================
--- trunk/conduit/modules/GoogleModule/gdata/Makefile.am	(original)
+++ trunk/conduit/modules/GoogleModule/gdata/Makefile.am	Tue Jun  3 19:34:29 2008
@@ -1,4 +1,4 @@
-SUBDIRS = calendar exif geo media photos
+SUBDIRS = calendar contacts exif geo media photos
 
 conduit_handlersdir = $(libdir)/conduit/modules/GoogleModule/gdata
 conduit_handlers_PYTHON = __init__.py auth.py service.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jun  3 19:34:29 2008
@@ -134,6 +134,7 @@
 conduit/modules/GoogleModule/atom/Makefile
 conduit/modules/GoogleModule/gdata/Makefile
 conduit/modules/GoogleModule/gdata/calendar/Makefile
+conduit/modules/GoogleModule/gdata/contacts/Makefile
 conduit/modules/GoogleModule/gdata/exif/Makefile
 conduit/modules/GoogleModule/gdata/geo/Makefile
 conduit/modules/GoogleModule/gdata/media/Makefile