--- configure.in	2007-10-10 16:16:32.358055811 -0400
+++ configure.new	2007-10-10 16:13:33.347854597 -0400
@@ -33,10 +33,10 @@
 
 AC_DEFINE_UNQUOTED(SERVER_VERSION_REQ, "$SERVER_REQ", [Minimal server version required])
 
-for version in 2.10 2.8 2.6 2.4; do 
+for version in 2.12 2.10 2.8 2.6 2.4; do 
 
 	AC_MSG_CHECKING([Checking for Evolution version $version])
-	EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null`
+	EVOLUTION_VERSION=`pkg-config --modversion evolution-shell 2>/dev/null`
 	
 	if test -z "$EVOLUTION_VERSION"; then
 		AC_MSG_RESULT([not found])
@@ -84,6 +84,14 @@
 	EDS_API_VERSION=1.2
 	;;
 
+        2.12)
+        EVOLUTION_API_VERSION=2.12
+        EAPI_MAJOR_VERSION=2
+        EAPI_MINOR_VERSION=12
+        CAMEL_API_VERSION=1.2
+        EDS_API_VERSION=1.2
+        ;;
+
 
 esac
 
@@ -147,14 +155,14 @@
 AC_SUBST(GTK_LIBS)
 
 dnl === evolution-plugin ==============
-PKG_CHECK_MODULES(EPLUGIN, evolution-plugin-$EVOLUTION_API_VERSION)
+PKG_CHECK_MODULES(EPLUGIN, evolution-plugin)
 AC_SUBST(EPLUGIN_CFLAGS)
 AC_SUBST(EPLUGIN_LIBS)
 
-eplugindir=`pkg-config --variable=plugindir evolution-plugin-$EVOLUTION_API_VERSION` 
+eplugindir=`pkg-config --variable=plugindir evolution-plugin` 
 AC_SUBST(eplugindir)
 
-eerrordir=`pkg-config --variable=errordir evolution-plugin-$EVOLUTION_API_VERSION`
+eerrordir=`pkg-config --variable=errordir evolution-plugin`
 AC_SUBST(eerrordir)
 
 EPLUGIN_RULE=$srcdir/eplugin.mk