From 7e7a145b8f482ebaca88a0427069166f1f117566 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 28 Sep 2009 15:16:14 +0100 Subject: Bug 583742 — Port to external libgdata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port Google account setup plugin to external libgdata. This drops the dependency on libgdata-1.2 from e-d-s, and add a dependency on the external libgdata >= 0.4.0. Closes: bgo#583742 --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index da093d76d6..907fae6d58 100644 --- a/configure.ac +++ b/configure.ac @@ -236,9 +236,8 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libedataserver-1.2 >= eds_minimum_version libedataserverui-1.2 >= eds_minimum_version libegroupwise-1.2 >= eds_minimum_version - libebackend-1.2 >= eds_minimum_version - libgdata-1.2 >= eds_minimum_version - libgdata-google-1.2 >= eds_minimum_version]) + libebackend-1.2 >= eds_minimum_version]) + dnl ****************************** dnl Canberra / Canberra-GTK Sound @@ -1307,7 +1306,11 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= libsoup_minimum_version) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor libgdata-1.2 libgdata-google-1.2) +EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) +AC_SUBST(GDATA_CFLAGS) +AC_SUBST(GDATA_LIBS) + +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-3.14 libebook-1.2 libecal-1.2 libedataserverui-1.2 libebackend-1.2 $libnotify gtkhtml-editor) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) -- cgit