[PATCH] Allow selecting which version of gmime is used to build notmuch.

diff --git a/da/c531b4b3bf316ab4400993e6389ec384aaf6f2 b/da/c531b4b3bf316ab4400993e6389ec384aaf6f2
new file mode 100644 (file)
index 0000000..20b639f
--- /dev/null
+++ b/da/c531b4b3bf316ab4400993e6389ec384aaf6f2
@@ -0,0 +1,90 @@
+Return-Path: <tom.prince@ualberta.net>\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 9D32E431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 09:54:57 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\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 7DJMZTupEqw6 for <notmuch@notmuchmail.org>;\r
+       Sat, 10 Mar 2012 09:54:56 -0800 (PST)\r
+Received: from socrates.hocat.ca (socrates.hocat.ca [76.10.188.53])\r
+       by olra.theworths.org (Postfix) with ESMTP id DE317431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 09:54:55 -0800 (PST)\r
+Received: from hermes.hocat.ca (hermes.hocat.ca [69.165.170.253])\r
+       by socrates.hocat.ca (Postfix) with SMTP id 974ED1AE3;\r
+       Sat, 10 Mar 2012 10:54:54 -0700 (MST)\r
+Received: (nullmailer pid 15699 invoked by uid 1000);\r
+       Sat, 10 Mar 2012 17:54:52 -0000\r
+From: Tom Prince <tom.prince@ualberta.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] Allow selecting which version of gmime is used to build\r
+       notmuch.\r
+Date: Sat, 10 Mar 2012 12:54:51 -0500\r
+Message-Id: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net>\r
+X-Mailer: git-send-email 1.7.8.4\r
+In-Reply-To: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>\r
+References: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>\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: Sat, 10 Mar 2012 17:54:57 -0000\r
+\r
+This allows for testing against both versions of gmime on a single\r
+machine, without having to mess with pkg-config paths.\r
+---\r
+ configure |    9 ++++++++-\r
+ 1 files changed, 8 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/configure b/configure\r
+index 8b85b9d..630d647 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -44,6 +44,7 @@ LIBDIR=\r
+ WITH_EMACS=1\r
+ WITH_BASH=1\r
+ WITH_ZSH=1\r
++WITH_GMIME_VERSIONS='gmime-2.6 gmime-2.4'\r
+ \r
+ usage ()\r
+ {\r
+@@ -170,6 +171,12 @@ for option; do\r
+       fi\r
+     elif [ "${option}" = '--without-zsh-completion' ] ; then\r
+       WITH_ZSH=0\r
++    elif [ "${option%%=*}" = '--with-gmime-version' ] ; then\r
++      if [ "${option#*=}" = '2.4' ]; then\r
++          WITH_GMIME_VERSIONS='gmime-2.4'\r
++        elif [ "${option#*=}" = '2.6' ]; then\r
++          WITH_GMIME_VERSIONS='gmime-2.6'\r
++      fi\r
+     elif [ "${option%%=*}" = '--build' ] ; then\r
+       build_option="${option#*=}"\r
+       case ${build_option} in\r
+@@ -275,7 +282,7 @@ fi\r
+ \r
+ printf "Checking for GMime development files... "\r
+ have_gmime=0\r
+-for gmimepc in gmime-2.6 gmime-2.4; do\r
++for gmimepc in $WITH_GMIME_VERSIONS; do\r
+     if pkg-config --exists $gmimepc; then\r
+       printf "Yes ($gmimepc).\n"\r
+       have_gmime=1\r
+-- \r
+1.7.8.4\r
+\r