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