[Gaim-commits] CVS: gaim configure.ac,1.271.2.38,1.271.2.39

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22800

Modified Files:
      Tag: oldstatus
	configure.ac 
Log Message:
the gevolution plugin works with evolution-data-server 1.0 or 1.2


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.271.2.38
retrieving revision 1.271.2.39
diff -u -d -p -r1.271.2.38 -r1.271.2.39
--- configure.ac	9 Apr 2005 16:35:58 -0000	1.271.2.38
+++ configure.ac	17 Apr 2005 15:36:07 -0000	1.271.2.39
@@ -330,23 +330,15 @@ build_gevo=no
 AC_ARG_ENABLE(gevolution, [  --disable-gevolution    compile without the Gaim-Evolution plugin],,enable_gevolution=yes)
 
 if test "x$enable_gevolution" = "xyes"; then
-	evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
+	evo_deps="libxml-2.0 libebook-1.2 libedata-book-1.2"
 	PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no)
+	if test "x$build_evo" = "xno"; then
+		evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0"
+		PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no)
+	fi
 
 	AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
 	AC_SUBST(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])
-	LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.0`
-	LIBEBOOK_MAJOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	LIBEBOOK_MINOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	LIBEBOOK_MICRO_VER=`echo $LIBEBOOK_VERSION | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	AC_MSG_RESULT($LIBEBOOK_VERSION)
-	AC_DEFINE_UNQUOTED(LIBEBOOK_MAJOR_VER, $LIBEBOOK_MAJOR_VER, [libebook major version.])
-	AC_DEFINE_UNQUOTED(LIBEBOOK_MINOR_VER, $LIBEBOOK_MINOR_VER, [libebook minor version.])
-	AC_DEFINE_UNQUOTED(LIBEBOOK_MICRO_VER, $LIBEBOOK_MICRO_VER, [libebook micro version.])
 fi
 
 AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$build_gevo" = "xyes")