Merge branch 'evoplugin'

diff --cc Makefile.am
Simple merge

diff --cc configure.ac
index b75c33c83ba15f1a468b862918b01301aa74d90a,7416781b62b83fb96857e9470a9f9fc8b95138bf..e0d6dca855f36fb5fc901986efbcf43b8c02a12d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -61,11 -59,14 +61,20 @@@ if test "$MSGFMT" = ""; the
     AC_MSG_ERROR([msgfmt could not be found. Try configuring with --disable-nls])
  fi
  
++
 +AC_PATH_PROG(PROTOC, protoc-c)
 +if test "$PROTOC" = ""; then
 +   AC_MSG_ERROR([protoc-c could not be found. Try installing protobuf-c-compiler])
 +fi
 +
+ build_evoplugin=
+ PKG_CHECK_MODULES(EVOLUTION, [evolution-calendar-3.0 evolution-shell-3.0 evolution-data-server-1.2 libebook-1.2 libecal-1.2],
+                 [build_evoplugin=yes
+                  evomoddir="$($PKG_CONFIG --variable=moduledir evolution-shell-3.0)"
+                  AC_SUBST(evomoddir, ${evomoddir})],
+                 [:]);
+ AM_CONDITIONAL(BUILD_EVOPLUGIN, [ test "$build_evoplugin" = "yes" ])
+ 
  AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
        ['$(top_srcdir)/po/LINGUAS'])