X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=configure;h=daee5a6e1637371cdda96d16c052ddd04a1ebfe6;hb=8e69663a8b4b9d1cce4faf7b55514ec3efe2499e;hp=ed7c22800530669ca88ef9ab5d6b7c4d71b7de0c;hpb=523d2b50fcaae90cbe09975c1f1bc652ff521ec6;p=notmuch

diff --git a/configure b/configure
index ed7c2280..daee5a6e 100755
--- a/configure
+++ b/configure
@@ -482,13 +482,21 @@ fi
 # 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_MINVER=2.6.7
+GMIME3_MINVER=3.0.3
 
 printf "Checking for GMime development files... "
-if pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then
-    printf "Yes.\n"
+if pkg-config --exists "gmime-3.0 > $GMIME3_MINVER"; then
+    printf "Yes (3.0).\n"
+    have_gmime=1
+    gmime_cflags=$(pkg-config --cflags gmime-3.0)
+    gmime_ldflags=$(pkg-config --libs gmime-3.0)
+    gmime_major=3
+elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then
+    printf "Yes (2.6).\n"
     have_gmime=1
     gmime_cflags=$(pkg-config --cflags gmime-2.6)
     gmime_ldflags=$(pkg-config --libs gmime-2.6)
+    gmime_major=2
 else
     have_gmime=0
     printf "No.\n"
@@ -1207,6 +1215,9 @@ NOTMUCH_PYTHON=${python}
 # building/testing ruby bindings.
 NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev}
 
+# Major version of gmime
+NOTMUCH_GMIME_MAJOR=${gmime_major}
+
 # Platform we are run on
 PLATFORM=${platform}
 EOF