Fix configure script to properly detect gmime-2.6 if available.

[notmuch] / configure

diff --git a/configure b/configure
index e90b76fa187f3b05893d90f085b595875fb79b35..dedb7d87ccb1530026fe960e6e6a1dddfa33bf38 100755 (executable)
--- a/configure
+++ b/configure
@@ -281,6 +281,7 @@ for gmimepc in gmime-2.6 gmime-2.4; do
        have_gmime=1
        gmime_cflags=$(pkg-config --cflags $gmimepc)
        gmime_ldflags=$(pkg-config --libs $gmimepc)
+       break
     fi
 done
 if [ "$have_gmime" = "0" ]; then
@@ -289,10 +290,10 @@ if [ "$have_gmime" = "0" ]; then
 fi
 
 # GMime already depends on Glib >= 2.12, but we use at least one Glib
-# function that only exists as of 2.14, (g_hash_table_get_keys)
-printf "Checking for Glib development files (>= 2.14)... "
+# function that only exists as of 2.22, (g_array_unref)
+printf "Checking for Glib development files (>= 2.22)... "
 have_glib=0
-if pkg-config --exists 'glib-2.0 >= 2.14'; then
+if pkg-config --exists 'glib-2.0 >= 2.22'; then
     printf "Yes.\n"
     have_glib=1
     glib_cflags=$(pkg-config --cflags glib-2.0)
@@ -416,7 +417,7 @@ EOF
        echo "  http://spruce.sourceforge.net/gmime/"
     fi
     if [ $have_glib -eq 0 ]; then
-       echo "  Glib library >= 2.14 (including development files such as headers)"
+       echo "  Glib library >= 2.22 (including development files such as headers)"
        echo "  http://ftp.gnome.org/pub/gnome/sources/glib/"
     fi
     if [ $have_talloc -eq 0 ]; then