Hello,

the following patch makes the evolution2_sync plugin build for both
evolution-2.0 and evolution-2.1 (to become 2.2 on release). It seems to
work fine, but I am not sure whether there is perhaps a more elegant
solution or whether you'd like to apply it a bit differently.

Anyway, it just fixes the build, there might be other issues. However, a
couple of people have reported success at
http://lists.ubuntu.com/archives/ubuntu-users/2004-December/014362.html
and follow-ups.

The patch is mostly against one of those cvs-snapshots, I hope it
applies with some fuzz at most.


cheers,

Michael
--- plugins/evolution2_sync/configure.in.orig   2004-12-08 18:15:17.000000000 
+0100
+++ plugins/evolution2_sync/configure.in        2004-12-08 18:21:57.000000000 
+0100
@@ -11,8 +11,11 @@
 AC_PROG_LIBTOOL
 AC_PROG_YACC
 
-pkg_modules="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0 libbonobo-2.0 
evolution-data-server-1.0 libebook-1.0 libecal-1.0 libedata-book-1.0 
libedata-cal-1.0 libedataserver-1.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+pkg_modules_generic="gtk+-2.0 libgnomeui-2.0 libbonoboui-2.0 glib-2.0 
libbonobo-2.0"
+pkg_modules_eds_1_0="evolution-data-server-1.0 libebook-1.0 libecal-1.0 
libedata-book-1.0 libedata-cal-1.0 libedataserver-1.0"
+pkg_modules_eds_1_2="evolution-data-server-1.2 libebook-1.2 libecal-1.2 
libedata-book-1.2 libedata-cal-1.2 libedataserver-1.2"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules_generic $pkg_modules_eds_1_0], , 
+       [PKG_CHECK_MODULES(PACKAGE, [$pkg_modules_generic 
$pkg_modules_eds_1_2])])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 

Reply via email to