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 880A6431FAF for ; Wed, 21 Mar 2012 12:18:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 1.167 X-Spam-Level: * X-Spam-Status: No, score=1.167 tagged_above=-999 required=5 tests=[INVALID_MSGID=1.167] autolearn=unavailable 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 eDiKIgv6Trs5 for ; Wed, 21 Mar 2012 12:18:53 -0700 (PDT) Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) by olra.theworths.org (Postfix) with ESMTP id 47541431FAE for ; Wed, 21 Mar 2012 12:18:53 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id 35CA668055; Wed, 21 Mar 2012 21:18:52 +0200 (EET) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH 2b/2] configure: print info about required gmime 2.4 or 2.6 versions Date: Wed, 21 Mar 2012 21:18:50 +0200 Message-Id: <1332281811-24710-2b-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1332281811-24710-1-git-send-email-tomi.ollila@iki.fi> References: <1332281811-24710-1-git-send-email-tomi.ollila@iki.fi> Cc: Tomi Ollila 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: Wed, 21 Mar 2012 19:18:53 -0000 In case required gmime (2.4 or 2.6) version if not found print information about both alternatives (and currently minimal 2.6 version that is needed). --- This replaces id:"1332281811-24710-2-git-send-email-tomi.ollila@iki.fi" (having itself id:"1332281811-24710-2b-git-send-email-tomi.ollila@iki.fi") IMHO this is better and more robust that the other one. trailing space in $GMIME_24_VERSION causes no problems (that could have been avoided but the code looks slighty clearer this way. configure | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 393f859..ace465b 100755 --- a/configure +++ b/configure @@ -48,8 +48,13 @@ WITH_EMACS=1 WITH_BASH=1 WITH_ZSH=1 -GMIME_24_VERSION='gmime-2.4' -GMIME_26_VERSION='gmime-2.6 >= 2.6.7' +# Compatible GMime versions (with constraints). +# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a +# crypto bug. We need 2.6.7 for permissive "From " header handling. +GMIME_24_VERSION_CTR='' +GMIME_24_VERSION="gmime-2.4 $GMIME_24_VERSION_CTR" +GMIME_26_VERSION_CTR='>= 2.6.7' +GMIME_26_VERSION="gmime-2.6 $GMIME_26_VERSION_CTR" WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION" @@ -259,8 +264,6 @@ if [ ${have_xapian} = "0" ]; then errors=$((errors + 1)) fi -# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a -# crypto bug. We need 2.6.7 for permissive "From " header handling. printf "Checking for GMime development files... " have_gmime=0 IFS=';' @@ -402,7 +405,8 @@ EOF echo " http://xapian.org/" fi if [ $have_gmime -eq 0 ]; then - echo " GMime 2.4 library (including development files such as headers)" + echo " Either GMime 2.4 library" $GMIME_24_VERSION_CTR "or GMime 2.6 library" $GMIME_26_VERSION_CTR + echo " (including development files such as headers)" echo " http://spruce.sourceforge.net/gmime/" echo fi -- 1.7.8.2