From 004ae5b87d9227198d44967d8db0737e6ff80a97 Mon Sep 17 00:00:00 2001
From: alexhudson <alexhudson@52461e19-6027-0410-9301-c4706890ca92>
Date: Sun, 7 Sep 2008 19:59:01 +0000
Subject: [PATCH] Look for and use GMime 2.0/2.2 if it's available, as well as
 2.4.

---
 m4/gmime.m4 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/m4/gmime.m4 b/m4/gmime.m4
index 1c5cb7f..1365986 100644
--- a/m4/gmime.m4
+++ b/m4/gmime.m4
@@ -16,19 +16,23 @@ AC_DEFUN([AC_CHECK_GMIME], [
         fi ],
       [ ac_gmime="auto" ] )
 
-  AC_MSG_CHECKING([for GMime-2.4])
-  
   if test "x$PKG_CONFIG" != "xno"; then
     if test "x$ac_gmime" = "xyes"; then
       ac_gmime_tmppkgconfig=$PKG_CONFIG_PATH
       export PKG_CONFIG_PATH=${ac_gmime_dir}/lib/pkgconfig/
       echo Setting path to $PKG_CONFIG_PATH
-      PKG_CHECK_MODULES(GMIME, gmime-2.4, ac_gmime="no")
+      PKG_CHECK_MODULES(GMIME, gmime-2.4, ,
+      [
+        PKG_CHECK_MODULES(GMIME, gmime-2.0, ac_gmime="no")
+      ])
       export PKG_CONFIG_PATH=$ac_gmime_tmppkgconfig
     fi
   
     if test "x$ac_gmime" = "xauto"; then
-      PKG_CHECK_MODULES(GMIME, gmime-2.4, ac_gmime="no")
+      PKG_CHECK_MODULES(GMIME, gmime-2.4, ,
+      [
+        PKG_CHECK_MODULES(GMIME, gmime-2.0, ac_gmime="no")
+      ])
     fi
   fi