/pidgin/main: 2ffc6571dc35: Add configure check for e-d-s being ...

Tomasz Wasilczyk twasilczyk at pidgin.im
Mon Feb 10 12:33:36 EST 2014


Changeset: 2ffc6571dc35870b3cafb717999cfdc12d93d15d
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-10 18:33 +0100
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/2ffc6571dc35

Description:

Add configure check for e-d-s being lower than 3.6. Refs #15353

diffstat:

 configure.ac |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,7 @@ Use --disable-gtkspell if you do not nee
 	dnl # Check for stuff needed by the Evolution integration plugin.
 	dnl #######################################################################
 	if test "x$enable_gevolution" = "xyes"; then
-		evo_deps="libebook-1.2 libedata-book-1.2"
+		evo_deps="libebook-1.2 libedata-book-1.2 evolution-data-server-1.2 < 3.6"
 		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, , [
 			enable_gevolution="no"
 		])
@@ -577,6 +577,8 @@ Use --disable-gtkspell if you do not nee
 			evo_deps="libebook-1.0 libedata-book-1.0"
 			PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
 				enable_gevolution="yes"
+			], [
+				enable_gevolution="no"
 			])
 		fi
 		if test "x$enable_gevolution" = "xyes"; then
@@ -586,7 +588,7 @@ Use --disable-gtkspell if you do not nee
 		else
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
-Evolution development headers not found.
+Evolution development headers not found (libebook, libedata-book, evolution-data-server < 3.6).
 Use --disable-gevolution if you do not need it.
 ])
 			fi



More information about the Commits mailing list