# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1085683396 0
# Node ID 61b33ac58669ab15b9982c42bd372a21f90ffce2
# Parent  d516da4b8ace7bd1f1a6587ccba05f03cb18019e
[gaim-migrate @ 9872]
Evolution bumps the version just before release, and libebook is part of
evolution-data-server, so we can't check what version we're using to
determine if we're calling the new libebook API or not. This should work
around that.

committer: Tailor Script <tailor@pidgin.im>

diff -r d516da4b8ace -r 61b33ac58669 configure.ac
--- a/configure.ac	Thu May 27 14:51:38 2004 +0000
+++ b/configure.ac	Thu May 27 18:43:16 2004 +0000
@@ -312,6 +312,15 @@
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
+	dnl This is necessary, because Evolution bumps the version just before
+	dnl release, and they broke the API in the current evolution-data-server
+	dnl release (0.0.93). Version checks won't work until 0.0.94, so we'll
+	dnl do this for now. Remove in a couple versions!
+	AC_CHECK_LIB(ebook, e_book_new_system_addressbook,
+	[
+		AC_DEFINE(LIBEBOOK_NEW_API, 1, [new API in libebook 0.0.94cvs])
+	], , $EVOLUTION_ADDRESSBOOK_LIBS)
+
 	dnl This can be removed in a few releases of Evolution, especially when
 	dnl it goes stable!
 	AC_MSG_CHECKING([libebook version])
diff -r d516da4b8ace -r 61b33ac58669 plugins/gevolution/gevo-util.c
--- a/plugins/gevolution/gevo-util.c	Thu May 27 14:51:38 2004 +0000
+++ b/plugins/gevolution/gevo-util.c	Thu May 27 18:43:16 2004 +0000
@@ -135,7 +135,8 @@
 
 	g_return_val_if_fail(book != NULL, FALSE);
 
-#if EBOOK_CHECK_VERSION(0, 0, 93)
+/* #if EBOOK_CHECK_VERSION(0, 0, 94) */
+#ifdef LIBEBOOK_NEW_API
 	*book = e_book_new_system_addressbook(NULL);
 
 	if (book != NULL)