From c8bebcbcc1d9f71a766cc36d9eedfd1611a12bfd Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Wed, 14 Mar 2012 17:00:00 +0200
Subject: [PATCH] [PATCH 2/2] Allow selecting which version of gmime is used to
 build notmuch.

---
 59/563b08a22ee92288cb886dcc8084c22dd6d02f | 105 ++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 59/563b08a22ee92288cb886dcc8084c22dd6d02f

diff --git a/59/563b08a22ee92288cb886dcc8084c22dd6d02f b/59/563b08a22ee92288cb886dcc8084c22dd6d02f
new file mode 100644
index 000000000..82386deea
--- /dev/null
+++ b/59/563b08a22ee92288cb886dcc8084c22dd6d02f
@@ -0,0 +1,105 @@
+Return-Path: <too@guru.guru-group.fi>
+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 A4F47431FBF
+	for <notmuch@notmuchmail.org>; Wed, 14 Mar 2012 08:00:09 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 oEdIfYhpxJgb for <notmuch@notmuchmail.org>;
+	Wed, 14 Mar 2012 08:00:07 -0700 (PDT)
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
+	by olra.theworths.org (Postfix) with ESMTP id 98714431FAF
+	for <notmuch@notmuchmail.org>; Wed, 14 Mar 2012 08:00:07 -0700 (PDT)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id 156F668056; Wed, 14 Mar 2012 17:00:07 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 2/2] Allow selecting which version of gmime is used to build
+	notmuch.
+Date: Wed, 14 Mar 2012 17:00:00 +0200
+Message-Id: <1331737200-16570-2-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.7.6.1
+In-Reply-To: <1331737200-16570-1-git-send-email-tomi.ollila@iki.fi>
+References: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net>
+	<1331737200-16570-1-git-send-email-tomi.ollila@iki.fi>
+Cc: Tomi Ollila <tomi.ollila@iki.fi>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Wed, 14 Mar 2012 15:00:09 -0000
+
+This allows for testing against both versions of gmime on a single
+machine, without having to mess with pkg-config paths.
+
+This is rework of Tom Prince's patch submitted in
+id:"1331402091-15663-1-git-send-email-tom.prince@ualberta.net"
+---
+ configure |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 3b2b6b7..1fb6cb7 100755
+--- a/configure
++++ b/configure
+@@ -48,6 +48,11 @@ WITH_EMACS=1
+ WITH_BASH=1
+ WITH_ZSH=1
+ 
++GMIME_24_VERSION='gmime-2.4'
++GMIME_26_VERSION='gmime-2.6 >= 2.6.7'
++
++WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION"
++
+ usage ()
+ {
+     cat <<EOF
+@@ -173,6 +178,12 @@ for option; do
+ 	fi
+     elif [ "${option}" = '--without-zsh-completion' ] ; then
+ 	WITH_ZSH=0
++    elif [ "${option%%=*}" = '--with-gmime-version' ] ; then
++	if [ "${option#*=}" = '2.4' ]; then
++	     WITH_GMIME_VERSIONS=$GMIME_24_VERSION
++	 elif [ "${option#*=}" = '2.6' ]; then
++	     WITH_GMIME_VERSIONS=$GMIME_26_VERSION
++	fi
+     elif [ "${option%%=*}" = '--build' ] ; then
+ 	build_option="${option#*=}"
+ 	case ${build_option} in
+@@ -280,7 +291,8 @@ fi
+ # crypto bug. We need 2.6.7 for permissive "From " header handling.
+ printf "Checking for GMime development files... "
+ have_gmime=0
+-for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
++IFS=';'
++for gmimepc in $WITH_GMIME_VERSIONS; do
+     if pkg-config --exists $gmimepc; then
+ 	printf "Yes ($gmimepc).\n"
+ 	have_gmime=1
+@@ -289,6 +301,7 @@ for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
+ 	break
+     fi
+ done
++IFS=$DEFAULT_IFS
+ if [ "$have_gmime" = "0" ]; then
+     printf "No.\n"
+     errors=$((errors + 1))
+-- 
+1.7.8.2
+
-- 
2.26.2