[PATCH 2b/2] configure: print info about required gmime 2.4 or 2.6 versions

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