/pidgin/main: 7ce36084847e: Fix gevolution build for newer libeb...

[Tomasz Wasilczyk]

Changeset: 7ce36084847e0e3a4d43cb2ea2397c407d8c8faa
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-10 17:27 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/7ce36084847e

Description:

Fix gevolution build for newer libebook releases

diffstat:

 configure.ac                           |  5 +++++
 pidgin/plugins/gevolution/gevolution.h |  6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diffs (31 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -648,6 +648,11 @@ Use --disable-gtkspell if you do not nee
 			AC_DEFINE(HAVE_EVOLUTION_ADDRESSBOOK, 1, [Define if we're using evolution addressbook.])
 			AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 			AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
+
+			CPPFLAGS_save="$CPPFLAGS"
+			CPPFLAGS="$CPPFLAGS $EVOLUTION_ADDRESSBOOK_CFLAGS"
+			AC_CHECK_HEADER(libebook/libebook.h, [AC_DEFINE(HAVE_LIBEBOOK_H, 1, [Define if libebook is recent enough to contain libebook/libebook.h.])], [])
+			CPPFLAGS="$CPPFLAGS_save"
 		else
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
diff --git a/pidgin/plugins/gevolution/gevolution.h b/pidgin/plugins/gevolution/gevolution.h
--- a/pidgin/plugins/gevolution/gevolution.h
+++ b/pidgin/plugins/gevolution/gevolution.h
@@ -25,7 +25,11 @@
 # include "config.h"
 #endif
 
-#include <libebook/e-book.h>
+#ifdef HAVE_LIBEBOOK_H
+#  include <libebook/libebook.h>
+#else
+#  include <libebook/e-book.h>
+#endif
 
 enum
 {