[PATCH] Fix configure script to properly detect gmime-2.6 if available.

diff --git a/94/3aa1489a55354d5af219feee43f29cfaec8f47 b/94/3aa1489a55354d5af219feee43f29cfaec8f47
new file mode 100644 (file)
index 0000000..4004aad
--- /dev/null
+++ b/94/3aa1489a55354d5af219feee43f29cfaec8f47
@@ -0,0 +1,80 @@
+Return-Path: <jrollins@finestructure.net>\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 620AF431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 08:45:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\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 EUMv6RU-RuyR for <notmuch@notmuchmail.org>;\r
+       Thu,  8 Mar 2012 08:45:10 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 00207431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 08:45:09 -0800 (PST)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id 7569B66E0226\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 08:45:07 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-174-137-84.socal.res.rr.com\r
+       [76.174.137.84]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id A94A066E021B\r
+       for <notmuch@notmuchmail.org>; Thu,  8 Mar 2012 08:45:02 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 4306A998; Thu,  8 Mar 2012 08:45:01 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] Fix configure script to properly detect gmime-2.6 if\r
+       available.\r
+Date: Thu,  8 Mar 2012 08:45:01 -0800\r
+Message-Id: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.9.1\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, 08 Mar 2012 16:45:10 -0000\r
+\r
+Previously, the configure script would appear to detect gmime-2.6 if\r
+present.  However, the binaries would end up being compiled against\r
+gmime-2.4.  The addition of a break fixes things so that now gmime-2.6\r
+will be used if available, falling back to gmime-2.4.\r
+---\r
+I was wondering why I wasn't seeing any of the problems bremner is\r
+reporting, even though I thought I had been using gmime-2.6 for the\r
+last month.  Apparently I had actually been using gmime-2.4 because of\r
+this bug in the configure script.  Linking will now be correct after\r
+reconfigure.\r
+\r
+ configure |    1 +\r
+ 1 files changed, 1 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 8b85b9d..dedb7d8 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -281,6 +281,7 @@ for gmimepc in gmime-2.6 gmime-2.4; do\r
+       have_gmime=1\r
+       gmime_cflags=$(pkg-config --cflags $gmimepc)\r
+       gmime_ldflags=$(pkg-config --libs $gmimepc)\r
++      break\r
+     fi\r
+ done\r
+ if [ "$have_gmime" = "0" ]; then\r
+-- \r
+1.7.9.1\r
+\r