[PATCH] configure: Add support for GMime 2.6

diff --git a/ab/27ea6e31eeb7a1140a71e9c4e8b6d22d6deed9 b/ab/27ea6e31eeb7a1140a71e9c4e8b6d22d6deed9
new file mode 100644 (file)
index 0000000..c6cd756
--- /dev/null
+++ b/ab/27ea6e31eeb7a1140a71e9c4e8b6d22d6deed9
@@ -0,0 +1,70 @@
+Return-Path: <abustany@mymadcat.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A4E364196F0\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Apr 2010 16:53:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.8\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.8 tagged_above=-999 required=5 tests=[BAYES_50=0.8]\r
+       autolearn=unavailable\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id b7hSU-wz3oTD for <notmuch@notmuchmail.org>;\r
+       Thu, 15 Apr 2010 16:53:00 -0700 (PDT)\r
+Received: from mail.mymadcat.com (mymadcat.com [213.251.163.154])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6492A431FC1\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Apr 2010 16:53:00 -0700 (PDT)\r
+Received: by mail.mymadcat.com (Postfix, from userid 504)\r
+       id 76C4A3DB75; Fri, 16 Apr 2010 01:52:59 +0200 (CEST)\r
+Received: from localhost (unknown [201.215.30.201])\r
+       by mail.mymadcat.com (Postfix) with ESMTPSA id 4B4AF3DB64;\r
+       Fri, 16 Apr 2010 01:52:58 +0200 (CEST)\r
+X-Mailbox-Line: From 55a5fe9aac29ae2c7c3d165dd0c3b9fef6460978 Mon Sep 17\r
+       00:00:00 2001\r
+From: Adrien Bustany <abustany@gnome.org>\r
+Date: Thu, 15 Apr 2010 19:41:55 -0400\r
+Subject: [PATCH] configure: Add support for GMime 2.6\r
+To: notmuch@notmuchmail.org\r
+Message-Id: <20100415235259.76C4A3DB75@mail.mymadcat.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 15 Apr 2010 23:53:00 -0000\r
+\r
+Notmuch compiles just fine with GMime 2.6, so accept it in the configure\r
+script.\r
+---\r
+ configure |    5 +++++\r
+ 1 files changed, 5 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index eebe075..d4d462f 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -188,6 +188,11 @@ if pkg-config --modversion gmime-2.4 > /dev/null 2>&1; then\r
+     have_gmime=1\r
+     gmime_cflags=$(pkg-config --cflags gmime-2.4)\r
+     gmime_ldflags=$(pkg-config --libs gmime-2.4)\r
++elif pkg-config --modversion gmime-2.6 > /dev/null 2>&1; then\r
++    printf "Yes.\n"\r
++    have_gmime=1\r
++    gmime_cflags=$(pkg-config --cflags gmime-2.6)\r
++    gmime_ldflags=$(pkg-config --libs gmime-2.6)\r
+ else\r
+     printf "No.\n"\r
+     have_gmime=0\r
+-- \r
+1.7.0.1\r
+\r