X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=71981b7c614a58f6b916acd49cf6515253dce396;hp=7056b4c29b054dfcbea60208928bd859062b9e0a;hb=076d779aab44bfddebaabd555fd5efc70031aab6;hpb=1ef9f769d78dcd7df80981ea435b246b378c6107

diff --git a/configure b/configure
index 7056b4c2..71981b7c 100755
--- a/configure
+++ b/configure
@@ -48,6 +48,16 @@ WITH_EMACS=1
 WITH_BASH=1
 WITH_ZSH=1
 
+# 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"
+
 usage ()
 {
     cat <<EOF
@@ -173,6 +183,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_24_VERSION
+	 elif [ "${option#*=}" = '2.6' ]; then
+	     WITH_GMIME_VERSIONS=$GMIME_26_VERSION
+	fi
     elif [ "${option%%=*}" = '--build' ] ; then
 	true
     elif [ "${option%%=*}" = '--host' ] ; then
@@ -248,11 +264,10 @@ 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
-for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
+IFS=';'
+for gmimepc in $WITH_GMIME_VERSIONS; do
     if pkg-config --exists $gmimepc; then
 	printf "Yes ($gmimepc).\n"
 	have_gmime=1
@@ -261,6 +276,7 @@ for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
 	break
     fi
 done
+IFS=$DEFAULT_IFS
 if [ "$have_gmime" = "0" ]; then
     printf "No.\n"
     errors=$((errors + 1))
@@ -389,26 +405,29 @@ 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
     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:
 
 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: