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