[PATCH 1/2] configure: add empty line after each missing component message

[PATCH 1/2] configure: add empty line after each missing component message

[Tomi Ollila]

Currently whenever message about missing GMime, Glib or talloc is
printed the message is 2 lines, component info and its http location
in next line. In the future the amount of lines will vary. To ease
reading in these cases newline is added after each message.
---
 configure |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 8cf6f2d..393f859 100755
--- a/configure
+++ b/configure
@@ -404,17 +404,19 @@ EOF
     if [ $have_gmime -eq 0 ]; then
 	echo "	GMime 2.4 library (including development files such as headers)"
 	echo "	http://spruce.sourceforge.net/gmime/"
+	echo
     fi
     if [ $have_glib -eq 0 ]; then
 	echo "	Glib library >= 2.22 (including development files such as headers)"
 	echo "	http://ftp.gnome.org/pub/gnome/sources/glib/"
+	echo
     fi
     if [ $have_talloc -eq 0 ]; then
 	echo "	The talloc library (including development files such as headers)"
 	echo "	http://talloc.samba.org/"
+	echo
     fi
     cat <<EOF
-
 With any luck, you're using a modern, package-based operating system
 that has all of these packages available in the distribution. In that
 case a simple command will install everything you need. For example:
-- 
1.7.8.2

[PATCH 2/2] configure: print info about required gmime 2.4 or 2.6 versions

[Tomi Ollila]

In case required gmime (2.4 or 2.6) version if not found print information
about both alternatives (and currently minimal 2.6 version that is needed).
---

I'm not entirely happy about the implementation but I would be less happy
to write static message that has the same spesific version information in
second place (third if comments are counted).

 configure |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 393f859..43c2436 100755
--- a/configure
+++ b/configure
@@ -402,7 +402,9 @@ EOF
 	echo "	http://xapian.org/"
     fi
     if [ $have_gmime -eq 0 ]; then
-	echo "	GMime 2.4 library (including development files such as headers)"
+	_24v=${GMIME_24_VERSION#*2.4} _26v=${GMIME_26_VERSION#*2.6}
+	echo "	Either GMime 2.4 library" $_24v "or GMime 2.6 library" $_26v
+	echo "	(including development files such as headers)"
 	echo "	http://spruce.sourceforge.net/gmime/"
 	echo
     fi
-- 
1.7.8.2

[PATCH 2b/2] configure: print info about required gmime 2.4 or 2.6 versions

[Tomi Ollila]

In case required gmime (2.4 or 2.6) version if not found print information
about both alternatives (and currently minimal 2.6 version that is needed).
---

This replaces id:"1332281811-24710-2-git-send-email-tomi.ollila@iki.fi"

(having itself id:"1332281811-24710-2b-git-send-email-tomi.ollila@iki.fi")

IMHO this is better and more robust that the other one. trailing space
in $GMIME_24_VERSION causes no problems (that could have been avoided
but the code looks slighty clearer this way.

 configure |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 393f859..ace465b 100755
--- a/configure
+++ b/configure
@@ -48,8 +48,13 @@ WITH_EMACS=1
 WITH_BASH=1
 WITH_ZSH=1
 
-GMIME_24_VERSION='gmime-2.4'
-GMIME_26_VERSION='gmime-2.6 >= 2.6.7'
+# Compatible GMime versions (with constraints).
+# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
+# crypto bug. We need 2.6.7 for permissive "From " header handling.
+GMIME_24_VERSION_CTR=''
+GMIME_24_VERSION="gmime-2.4 $GMIME_24_VERSION_CTR"
+GMIME_26_VERSION_CTR='>= 2.6.7'
+GMIME_26_VERSION="gmime-2.6 $GMIME_26_VERSION_CTR"
 
 WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION"
 
@@ -259,8 +264,6 @@ if [ ${have_xapian} = "0" ]; then
     errors=$((errors + 1))
 fi
 
-# If using GMime 2.6, we need to have a version >= 2.6.5 to avoid a
-# crypto bug. We need 2.6.7 for permissive "From " header handling.
 printf "Checking for GMime development files... "
 have_gmime=0
 IFS=';'
@@ -402,7 +405,8 @@ EOF
 	echo "	http://xapian.org/"
     fi
     if [ $have_gmime -eq 0 ]; then
-	echo "	GMime 2.4 library (including development files such as headers)"
+	echo "	Either GMime 2.4 library" $GMIME_24_VERSION_CTR "or GMime 2.6 library" $GMIME_26_VERSION_CTR
+	echo "	(including development files such as headers)"
 	echo "	http://spruce.sourceforge.net/gmime/"
 	echo
     fi
-- 
1.7.8.2

[PATCH] configure: change gmime version in help message to 2.6

[David Bremner]

From: David Bremner <bremner@debian.org>

Since GMime 2.6 is now the stable version upstream, and probably the
most tested by notmuch developers, it makes sense to suggest that to
users to install.
---

Tomi's second patch looks fine to me, and I promoted it to pushable. I
also noticed this minor issue with the help message.

 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index ace465b..71981b7 100755
--- a/configure
+++ b/configure
@@ -427,7 +427,7 @@ case a simple command will install everything you need. For example:
 
 On Debian and similar systems:
 
-	sudo apt-get install libxapian-dev libgmime-2.4-dev libtalloc-dev
+	sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev
 
 Or on Fedora and similar systems:
 
-- 
1.7.9.1

Re: [PATCH] configure: change gmime version in help message to 2.6

[David Bremner]

David Bremner <david@tethera.net> writes:
>
> Tomi's second patch looks fine to me, and I promoted it to pushable. I
> also noticed this minor issue with the help message.

I have pushed Tomi's two patches, and my 1 followup.

d