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

This allows for testing against both versions of gmime on a single
machine, without having to mess with pkg-config paths.

This is rework of Tom Prince's patch submitted in
id:"1331402091-15663-1-git-send-email-tom.prince@ualberta.net"
This commit is contained in:
Tomi Ollila 2012-03-14 17:00:00 +02:00 committed by David Bremner
parent 1ef9f769d7
commit 8bf1842b19

15
configure vendored
View file

@ -48,6 +48,11 @@ WITH_EMACS=1
WITH_BASH=1 WITH_BASH=1
WITH_ZSH=1 WITH_ZSH=1
GMIME_24_VERSION='gmime-2.4'
GMIME_26_VERSION='gmime-2.6 >= 2.6.7'
WITH_GMIME_VERSIONS="$GMIME_26_VERSION;$GMIME_24_VERSION"
usage () usage ()
{ {
cat <<EOF cat <<EOF
@ -173,6 +178,12 @@ for option; do
fi fi
elif [ "${option}" = '--without-zsh-completion' ] ; then elif [ "${option}" = '--without-zsh-completion' ] ; then
WITH_ZSH=0 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 elif [ "${option%%=*}" = '--build' ] ; then
true true
elif [ "${option%%=*}" = '--host' ] ; then elif [ "${option%%=*}" = '--host' ] ; then
@ -252,7 +263,8 @@ fi
# crypto bug. We need 2.6.7 for permissive "From " header handling. # crypto bug. We need 2.6.7 for permissive "From " header handling.
printf "Checking for GMime development files... " printf "Checking for GMime development files... "
have_gmime=0 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 if pkg-config --exists $gmimepc; then
printf "Yes ($gmimepc).\n" printf "Yes ($gmimepc).\n"
have_gmime=1 have_gmime=1
@ -261,6 +273,7 @@ for gmimepc in 'gmime-2.6 >= 2.6.7' gmime-2.4; do
break break
fi fi
done done
IFS=$DEFAULT_IFS
if [ "$have_gmime" = "0" ]; then if [ "$have_gmime" = "0" ]; then
printf "No.\n" printf "No.\n"
errors=$((errors + 1)) errors=$((errors + 1))