From: Christian H. <ch...@us...> - 2004-05-23 22:43:48
|
Update of /cvsroot/gaim/gaim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4884 Modified Files: configure.ac Log Message: The gevolution plugin should now compile with both the previous release of Evolution/e-d-s and with e-d-s CVS. Index: configure.ac =================================================================== RCS file: /cvsroot/gaim/gaim/configure.ac,v retrieving revision 1.249 retrieving revision 1.250 diff -u -d -p -r1.249 -r1.250 --- configure.ac 20 May 2004 23:52:10 -0000 1.249 +++ configure.ac 23 May 2004 22:43:35 -0000 1.250 @@ -306,13 +306,23 @@ 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" PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, build_gevo=yes, build_gevo=no) 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") |