1 Return-Path: <tom.prince@ualberta.net>
\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 9D32E431FBC
\r
6 for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 09:54:57 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 7DJMZTupEqw6 for <notmuch@notmuchmail.org>;
\r
16 Sat, 10 Mar 2012 09:54:56 -0800 (PST)
\r
17 Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53])
\r
18 by olra.theworths.org (Postfix) with ESMTP id DE317431FAE
\r
19 for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 09:54:55 -0800 (PST)
\r
20 Received: from hermes.hocat.ca (hermes.hocat.ca [69.165.170.253])
\r
21 by socrates.hocat.ca (Postfix) with SMTP id 974ED1AE3;
\r
22 Sat, 10 Mar 2012 10:54:54 -0700 (MST)
\r
23 Received: (nullmailer pid 15699 invoked by uid 1000);
\r
24 Sat, 10 Mar 2012 17:54:52 -0000
\r
25 From: Tom Prince <tom.prince@ualberta.net>
\r
26 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
27 Subject: [PATCH] Allow selecting which version of gmime is used to build
\r
29 Date: Sat, 10 Mar 2012 12:54:51 -0500
\r
30 Message-Id: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net>
\r
31 X-Mailer: git-send-email 1.7.8.4
\r
32 In-Reply-To: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>
\r
33 References: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.13
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Sat, 10 Mar 2012 17:54:57 -0000
\r
48 This allows for testing against both versions of gmime on a single
\r
49 machine, without having to mess with pkg-config paths.
\r
51 configure | 9 ++++++++-
\r
52 1 files changed, 8 insertions(+), 1 deletions(-)
\r
54 diff --git a/configure b/configure
\r
55 index 8b85b9d..630d647 100755
\r
58 @@ -44,6 +44,7 @@ LIBDIR=
\r
62 +WITH_GMIME_VERSIONS='gmime-2.6 gmime-2.4'
\r
66 @@ -170,6 +171,12 @@ for option; do
\r
68 elif [ "${option}" = '--without-zsh-completion' ] ; then
\r
70 + elif [ "${option%%=*}" = '--with-gmime-version' ] ; then
\r
71 + if [ "${option#*=}" = '2.4' ]; then
\r
72 + WITH_GMIME_VERSIONS='gmime-2.4'
\r
73 + elif [ "${option#*=}" = '2.6' ]; then
\r
74 + WITH_GMIME_VERSIONS='gmime-2.6'
\r
76 elif [ "${option%%=*}" = '--build' ] ; then
\r
77 build_option="${option#*=}"
\r
78 case ${build_option} in
\r
79 @@ -275,7 +282,7 @@ fi
\r
81 printf "Checking for GMime development files... "
\r
83 -for gmimepc in gmime-2.6 gmime-2.4; do
\r
84 +for gmimepc in $WITH_GMIME_VERSIONS; do
\r
85 if pkg-config --exists $gmimepc; then
\r
86 printf "Yes ($gmimepc).\n"
\r