unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Tom Prince <tom.prince@ualberta.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH] Allow selecting which version of gmime is used to build notmuch.
Date: Sat, 10 Mar 2012 12:54:51 -0500	[thread overview]
Message-ID: <1331402091-15663-1-git-send-email-tom.prince@ualberta.net> (raw)
In-Reply-To: <1331225101-24385-1-git-send-email-jrollins@finestructure.net>

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

  reply	other threads:[~2012-03-10 17:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-08 16:45 [PATCH] Fix configure script to properly detect gmime-2.6 if available Jameson Graef Rollins
2012-03-10 17:54 ` Tom Prince [this message]
2012-03-14 14:59   ` [PATCH 1/2] configure: store $IFS to $DEFAULT_IFS readonly variable Tomi Ollila
2012-03-14 15:00     ` [PATCH 2/2] Allow selecting which version of gmime is used to build notmuch Tomi Ollila
2012-03-18 13:31     ` [PATCH 1/2] configure: store $IFS to $DEFAULT_IFS readonly variable David Bremner
2012-03-20 11:19     ` David Bremner
2012-03-11  1:48 ` [PATCH] Fix configure script to properly detect gmime-2.6 if available David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331402091-15663-1-git-send-email-tom.prince@ualberta.net \
    --to=tom.prince@ualberta.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).