diff -Naur tomboy-0.12.2/configure tomboy-0.12.2.new/configure
--- tomboy-0.12.2/configure	2008-12-17 15:30:17.000000000 -0600
+++ tomboy-0.12.2.new/configure	2009-01-05 23:21:18.513404911 -0600
@@ -24302,12 +24302,12 @@
     pkg_cv_EVOLUTION_CFLAGS="$EVOLUTION_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-sharp\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gmime-sharp") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-sharp-2.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gmime-sharp-2.4") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EVOLUTION_CFLAGS=`$PKG_CONFIG --cflags "gmime-sharp" 2>/dev/null`
+  pkg_cv_EVOLUTION_CFLAGS=`$PKG_CONFIG --cflags "gmime-sharp-2.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24318,12 +24318,12 @@
     pkg_cv_EVOLUTION_LIBS="$EVOLUTION_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-sharp\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gmime-sharp") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmime-sharp-2.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gmime-sharp-2.4") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_EVOLUTION_LIBS=`$PKG_CONFIG --libs "gmime-sharp" 2>/dev/null`
+  pkg_cv_EVOLUTION_LIBS=`$PKG_CONFIG --libs "gmime-sharp-2.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24341,9 +24341,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-sharp" 2>&1`
+	        EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmime-sharp-2.4" 2>&1`
         else
-	        EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-sharp" 2>&1`
+	        EVOLUTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmime-sharp-2.4" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVOLUTION_PKG_ERRORS" >&5
@@ -24489,12 +24489,12 @@
     pkg_cv_NUNIT_CFLAGS="$NUNIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
-  ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "nunit" 2>/dev/null`
+  pkg_cv_NUNIT_CFLAGS=`$PKG_CONFIG --cflags "mono-nunit" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24505,12 +24505,12 @@
     pkg_cv_NUNIT_LIBS="$NUNIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nunit\"") >&5
-  ($PKG_CONFIG --exists --print-errors "nunit") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mono-nunit\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mono-nunit") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "nunit" 2>/dev/null`
+  pkg_cv_NUNIT_LIBS=`$PKG_CONFIG --libs "mono-nunit" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -24528,9 +24528,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nunit" 2>&1`
+	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mono-nunit" 2>&1`
         else
-	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "nunit" 2>&1`
+	        NUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "mono-nunit" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$NUNIT_PKG_ERRORS" >&5
diff -Naur tomboy-0.12.2/configure.in tomboy-0.12.2.new/configure.in
--- tomboy-0.12.2/configure.in	2008-12-17 15:27:49.000000000 -0600
+++ tomboy-0.12.2.new/configure.in	2009-01-05 23:21:44.573133601 -0600
@@ -193,7 +193,7 @@
 #
 # Evolution.dll needs Gmime#
 #
-PKG_CHECK_MODULES(EVOLUTION, gmime-sharp, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.4, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
 AC_ARG_ENABLE(evolution, 
 	      [  --enable-evolution[[=no/yes]]  compile evolution addin [[default: yes]]],
 	      ENABLE_EVOLUTION="$enableval")
@@ -221,7 +221,7 @@
 #
 # NUnit required for (optional) unit tests
 #
-PKG_CHECK_MODULES(NUNIT, nunit, HAVE_NUNIT="yes", HAVE_NUNIT="no")
+PKG_CHECK_MODULES(NUNIT, mono-nunit, HAVE_NUNIT="yes", HAVE_NUNIT="no")
 AM_CONDITIONAL(HAVE_NUNIT, test "$HAVE_NUNIT" = "yes")
 AC_SUBST(NUNIT_LIBS)
 AC_PATH_PROG(NUNIT, nunit-console)