[evolution-rss] do not install bonobo server files for newer evolution

[Lucian Langa <lucilanga src gnome org>]

commit 4d0d56f3114197baaee35c065edc188219fdff01
Author: Lucian Langa <lucilanga gnome org>
Date:   Sat Jan 9 22:30:57 2010 +0200

    do not install bonobo server files for newer evolution

 configure.ac    |   11 ++++++++++-
 src/Makefile.am |    5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1150715..43ea5c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,6 +307,13 @@ if test "x$enable_dbus" != "xno"; then
 fi
 AM_CONDITIONAL([HAVE_DBUS], [test x$have_dbus = xyes])
 
+evolution_int_version="$(echo "$EVOLUTION_EXEC_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
+if test $evolution_int_version -lt 22900; then
+	have_bonobo=yes
+fi
+
+AM_CONDITIONAL([HAVE_BONOBO], [test "x$have_bonobo" = "xyes"])
+
 dnl I18n stuff
 AC_PATH_PROG(GETTEXT, gettext, no)
 if test "x$GETTEXT" = "xno"; then
@@ -327,8 +334,11 @@ AC_SUBST(SOEXT)
 EVO_SERVER_RULE=$srcdir/server.mk
 AC_SUBST_FILE(EVO_SERVER_RULE)
 
+if test "x$have_bonobo" = "xyes"; then
+
 serverdir="$BONOBO_LIBDIR/bonobo/servers"
 AC_SUBST(serverdir)
+fi
 
 privdatadir='${datadir}'/evolution/$EVOLUTION_EXEC_VERSION
 AC_SUBST(privdatadir)
@@ -345,7 +355,6 @@ case "$host" in
 *-mingw*)
     os_win32=yes
     NO_UNDEFINED='-no-undefined'
-	evolution_int_version="$(echo "$EVOLUTION_EXEC_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
 	if test $evolution_int_version -ge 22700; then
 		NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail-shared -levolution-mail -lemiscwidgets'
 	else
diff --git a/src/Makefile.am b/src/Makefile.am
index 36cd2a4..f4bdd8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,8 +100,11 @@ schemadir	= $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = evolution-rss.schemas.in
 schema_DATA	= $(schema_in_files:.schemas.in=.schemas)
 
+if HAVE_BONOBO
 server_in_files = GNOME_Evolution_RSS.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(EVOLUTION_EXEC_VERSION).server)
+endif
+
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_SCHEMAS_RULE@
@@ -139,7 +142,7 @@ CLEANFILES	= $(BUILT_SOURCES)	\
 	GNOME_Evolution_RSS.server.in	\
 	evolution-rss.schemas
 
-EXTRA_DIST = 					\
+EXTRA_DIST =					\
 	$(glade_DATA)				\
 	$(server_in_files)			\
         $(schema_in_files)			\