1 Return-Path: <too@guru.guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 880A6431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 21 Mar 2012 12:18:53 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=1.167 tagged_above=-999 required=5
\r
12 tests=[INVALID_MSGID=1.167] autolearn=unavailable
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id eDiKIgv6Trs5 for <notmuch@notmuchmail.org>;
\r
16 Wed, 21 Mar 2012 12:18:53 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 47541431FAE
\r
19 for <notmuch@notmuchmail.org>; Wed, 21 Mar 2012 12:18:53 -0700 (PDT)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 35CA668055; Wed, 21 Mar 2012 21:18:52 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH 2b/2] configure: print info about required gmime 2.4 or 2.6
\r
26 Date: Wed, 21 Mar 2012 21:18:50 +0200
\r
27 Message-Id: <1332281811-24710-2b-git-send-email-tomi.ollila@iki.fi>
\r
28 X-Mailer: git-send-email 1.7.6.1
\r
29 In-Reply-To: <1332281811-24710-1-git-send-email-tomi.ollila@iki.fi>
\r
30 References: <1332281811-24710-1-git-send-email-tomi.ollila@iki.fi>
\r
31 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Wed, 21 Mar 2012 19:18:53 -0000
\r
46 In case required gmime (2.4 or 2.6) version if not found print information
\r
47 about both alternatives (and currently minimal 2.6 version that is needed).
\r
50 This replaces id:"1332281811-24710-2-git-send-email-tomi.ollila@iki.fi"
\r
52 (having itself id:"1332281811-24710-2b-git-send-email-tomi.ollila@iki.fi")
\r
54 IMHO this is better and more robust that the other one. trailing space
\r
55 in $GMIME_24_VERSION causes no problems (that could have been avoided
\r
56 but the code looks slighty clearer this way.
\r
58 configure | 14 +++++++++-----
\r
59 1 files changed, 9 insertions(+), 5 deletions(-)
\r
61 diff --git a/configure b/configure
\r
62 index 393f859..ace465b 100755
\r
65 @@ -48,8 +48,13 @@ WITH_EMACS=1
\r
69 -GMIME_24_VERSION='gmime-2.4'
\r
70 -GMIME_26_VERSION='gmime-2.6 >= 2.6.7'
\r
71 +# Compatible GMime versions (with constraints).
\r
72 +# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
\r
73 +# crypto bug. We need 2.6.7 for permissive "From " header handling.
\r
74 +GMIME_24_VERSION_CTR=''
\r
75 +GMIME_24_VERSION="gmime-2.4 $GMIME_24_VERSION_CTR"
\r
76 +GMIME_26_VERSION_CTR='>= 2.6.7'
\r
77 +GMIME_26_VERSION="gmime-2.6 $GMIME_26_VERSION_CTR"
\r
79 WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION"
\r
81 @@ -259,8 +264,6 @@ if [ ${have_xapian} = "0" ]; then
\r
82 errors=$((errors + 1))
\r
85 -# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
\r
86 -# crypto bug. We need 2.6.7 for permissive "From " header handling.
\r
87 printf "Checking for GMime development files... "
\r
90 @@ -402,7 +405,8 @@ EOF
\r
91 echo " http://xapian.org/"
\r
93 if [ $have_gmime -eq 0 ]; then
\r
94 - echo " GMime 2.4 library (including development files such as headers)"
\r
95 + echo " Either GMime 2.4 library" $GMIME_24_VERSION_CTR "or GMime 2.6 library" $GMIME_26_VERSION_CTR
\r
96 + echo " (including development files such as headers)"
\r
97 echo " http://spruce.sourceforge.net/gmime/"
\r